The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/skia/patches/0030-Bug-939629-Add-missing-include-guards.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,94 @@
     1.4 +# HG changeset patch
     1.5 +# Parent 979e60d9c09f22eb139643da6de7568b603e1aa1
     1.6 +
     1.7 +diff --git a/gfx/skia/include/images/SkImages.h b/gfx/skia/include/images/SkImages.h
     1.8 +--- a/gfx/skia/include/images/SkImages.h
     1.9 ++++ b/gfx/skia/include/images/SkImages.h
    1.10 +@@ -1,14 +1,19 @@
    1.11 + /*
    1.12 +  * Copyright 2012 Google Inc.
    1.13 +  *
    1.14 +  * Use of this source code is governed by a BSD-style license that can be
    1.15 +  * found in the LICENSE file.
    1.16 +  */
    1.17 + 
    1.18 ++#ifndef SkImages_DEFINED
    1.19 ++#define SkImages_DEFINED
    1.20 ++
    1.21 + class SkImages {
    1.22 + public:
    1.23 +     /**
    1.24 +      * Initializes flattenables in the images project.
    1.25 +      */
    1.26 +     static void InitializeFlattenables();
    1.27 + };
    1.28 ++
    1.29 ++#endif
    1.30 +diff --git a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h
    1.31 +--- a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h
    1.32 ++++ b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h
    1.33 +@@ -1,16 +1,19 @@
    1.34 + 
    1.35 + /*
    1.36 +  * Copyright 2012 Google Inc.
    1.37 +  *
    1.38 +  * Use of this source code is governed by a BSD-style license that can be
    1.39 +  * found in the LICENSE file.
    1.40 +  */
    1.41 + 
    1.42 ++#ifndef GrAAConvexPathRenderer_DEFINED
    1.43 ++#define GrAAConvexPathRenderer_DEFINED
    1.44 ++
    1.45 + #include "GrPathRenderer.h"
    1.46 + 
    1.47 + 
    1.48 + class GrAAConvexPathRenderer : public GrPathRenderer {
    1.49 + public:
    1.50 +     GrAAConvexPathRenderer();
    1.51 + 
    1.52 +     virtual bool canDrawPath(const SkPath& path,
    1.53 +@@ -19,8 +22,10 @@ public:
    1.54 +                              bool antiAlias) const SK_OVERRIDE;
    1.55 + 
    1.56 + protected:
    1.57 +     virtual bool onDrawPath(const SkPath& path,
    1.58 +                             const SkStrokeRec& stroke,
    1.59 +                             GrDrawTarget* target,
    1.60 +                             bool antiAlias) SK_OVERRIDE;
    1.61 + };
    1.62 ++
    1.63 ++#endif
    1.64 +diff --git a/gfx/skia/src/gpu/GrReducedClip.h b/gfx/skia/src/gpu/GrReducedClip.h
    1.65 +--- a/gfx/skia/src/gpu/GrReducedClip.h
    1.66 ++++ b/gfx/skia/src/gpu/GrReducedClip.h
    1.67 +@@ -1,16 +1,19 @@
    1.68 + 
    1.69 + /*
    1.70 +  * Copyright 2012 Google Inc.
    1.71 +  *
    1.72 +  * Use of this source code is governed by a BSD-style license that can be
    1.73 +  * found in the LICENSE file.
    1.74 +  */
    1.75 + 
    1.76 ++#ifndef GrReducedClip_DEFINED
    1.77 ++#define GrReducedClip_DEFINED
    1.78 ++
    1.79 + #include "SkClipStack.h"
    1.80 + #include "SkTLList.h"
    1.81 + 
    1.82 + namespace GrReducedClip {
    1.83 + 
    1.84 + typedef SkTLList<SkClipStack::Element> ElementList;
    1.85 + 
    1.86 + enum InitialState {
    1.87 +@@ -33,8 +36,10 @@ enum InitialState {
    1.88 + void ReduceClipStack(const SkClipStack& stack,
    1.89 +                      const SkIRect& queryBounds,
    1.90 +                      ElementList* result,
    1.91 +                      InitialState* initialState,
    1.92 +                      SkIRect* tighterBounds = NULL,
    1.93 +                      bool* requiresAA = NULL);
    1.94 + 
    1.95 + } // namespace GrReducedClip
    1.96 ++
    1.97 ++#endif