0030-Bug-939629-Add-missing-include-guards.patch (2509B)
1 # HG changeset patch 2 # Parent 979e60d9c09f22eb139643da6de7568b603e1aa1 3 4 diff --git a/gfx/skia/include/images/SkImages.h b/gfx/skia/include/images/SkImages.h 5 --- a/gfx/skia/include/images/SkImages.h 6 +++ b/gfx/skia/include/images/SkImages.h 7 @@ -1,14 +1,19 @@ 8 /* 9 * Copyright 2012 Google Inc. 10 * 11 * Use of this source code is governed by a BSD-style license that can be 12 * found in the LICENSE file. 13 */ 14 15 +#ifndef SkImages_DEFINED 16 +#define SkImages_DEFINED 17 + 18 class SkImages { 19 public: 20 /** 21 * Initializes flattenables in the images project. 22 */ 23 static void InitializeFlattenables(); 24 }; 25 + 26 +#endif 27 diff --git a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h 28 --- a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h 29 +++ b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h 30 @@ -1,16 +1,19 @@ 31 32 /* 33 * Copyright 2012 Google Inc. 34 * 35 * Use of this source code is governed by a BSD-style license that can be 36 * found in the LICENSE file. 37 */ 38 39 +#ifndef GrAAConvexPathRenderer_DEFINED 40 +#define GrAAConvexPathRenderer_DEFINED 41 + 42 #include "GrPathRenderer.h" 43 44 45 class GrAAConvexPathRenderer : public GrPathRenderer { 46 public: 47 GrAAConvexPathRenderer(); 48 49 virtual bool canDrawPath(const SkPath& path, 50 @@ -19,8 +22,10 @@ public: 51 bool antiAlias) const SK_OVERRIDE; 52 53 protected: 54 virtual bool onDrawPath(const SkPath& path, 55 const SkStrokeRec& stroke, 56 GrDrawTarget* target, 57 bool antiAlias) SK_OVERRIDE; 58 }; 59 + 60 +#endif 61 diff --git a/gfx/skia/src/gpu/GrReducedClip.h b/gfx/skia/src/gpu/GrReducedClip.h 62 --- a/gfx/skia/src/gpu/GrReducedClip.h 63 +++ b/gfx/skia/src/gpu/GrReducedClip.h 64 @@ -1,16 +1,19 @@ 65 66 /* 67 * Copyright 2012 Google Inc. 68 * 69 * Use of this source code is governed by a BSD-style license that can be 70 * found in the LICENSE file. 71 */ 72 73 +#ifndef GrReducedClip_DEFINED 74 +#define GrReducedClip_DEFINED 75 + 76 #include "SkClipStack.h" 77 #include "SkTLList.h" 78 79 namespace GrReducedClip { 80 81 typedef SkTLList<SkClipStack::Element> ElementList; 82 83 enum InitialState { 84 @@ -33,8 +36,10 @@ enum InitialState { 85 void ReduceClipStack(const SkClipStack& stack, 86 const SkIRect& queryBounds, 87 ElementList* result, 88 InitialState* initialState, 89 SkIRect* tighterBounds = NULL, 90 bool* requiresAA = NULL); 91 92 } // namespace GrReducedClip 93 + 94 +#endif