gfx/skia/patches/0030-Bug-939629-Add-missing-include-guards.patch@129ffea94266 (annotated)
gfx/skia/patches/0030-Bug-939629-Add-missing-include-guards.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # Parent 979e60d9c09f22eb139643da6de7568b603e1aa1 |
| michael@0 | 3 | |
| michael@0 | 4 | diff --git a/gfx/skia/include/images/SkImages.h b/gfx/skia/include/images/SkImages.h |
| michael@0 | 5 | --- a/gfx/skia/include/images/SkImages.h |
| michael@0 | 6 | +++ b/gfx/skia/include/images/SkImages.h |
| michael@0 | 7 | @@ -1,14 +1,19 @@ |
| michael@0 | 8 | /* |
| michael@0 | 9 | * Copyright 2012 Google Inc. |
| michael@0 | 10 | * |
| michael@0 | 11 | * Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 12 | * found in the LICENSE file. |
| michael@0 | 13 | */ |
| michael@0 | 14 | |
| michael@0 | 15 | +#ifndef SkImages_DEFINED |
| michael@0 | 16 | +#define SkImages_DEFINED |
| michael@0 | 17 | + |
| michael@0 | 18 | class SkImages { |
| michael@0 | 19 | public: |
| michael@0 | 20 | /** |
| michael@0 | 21 | * Initializes flattenables in the images project. |
| michael@0 | 22 | */ |
| michael@0 | 23 | static void InitializeFlattenables(); |
| michael@0 | 24 | }; |
| michael@0 | 25 | + |
| michael@0 | 26 | +#endif |
| michael@0 | 27 | diff --git a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h |
| michael@0 | 28 | --- a/gfx/skia/src/gpu/GrAAConvexPathRenderer.h |
| michael@0 | 29 | +++ b/gfx/skia/src/gpu/GrAAConvexPathRenderer.h |
| michael@0 | 30 | @@ -1,16 +1,19 @@ |
| michael@0 | 31 | |
| michael@0 | 32 | /* |
| michael@0 | 33 | * Copyright 2012 Google Inc. |
| michael@0 | 34 | * |
| michael@0 | 35 | * Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 36 | * found in the LICENSE file. |
| michael@0 | 37 | */ |
| michael@0 | 38 | |
| michael@0 | 39 | +#ifndef GrAAConvexPathRenderer_DEFINED |
| michael@0 | 40 | +#define GrAAConvexPathRenderer_DEFINED |
| michael@0 | 41 | + |
| michael@0 | 42 | #include "GrPathRenderer.h" |
| michael@0 | 43 | |
| michael@0 | 44 | |
| michael@0 | 45 | class GrAAConvexPathRenderer : public GrPathRenderer { |
| michael@0 | 46 | public: |
| michael@0 | 47 | GrAAConvexPathRenderer(); |
| michael@0 | 48 | |
| michael@0 | 49 | virtual bool canDrawPath(const SkPath& path, |
| michael@0 | 50 | @@ -19,8 +22,10 @@ public: |
| michael@0 | 51 | bool antiAlias) const SK_OVERRIDE; |
| michael@0 | 52 | |
| michael@0 | 53 | protected: |
| michael@0 | 54 | virtual bool onDrawPath(const SkPath& path, |
| michael@0 | 55 | const SkStrokeRec& stroke, |
| michael@0 | 56 | GrDrawTarget* target, |
| michael@0 | 57 | bool antiAlias) SK_OVERRIDE; |
| michael@0 | 58 | }; |
| michael@0 | 59 | + |
| michael@0 | 60 | +#endif |
| michael@0 | 61 | diff --git a/gfx/skia/src/gpu/GrReducedClip.h b/gfx/skia/src/gpu/GrReducedClip.h |
| michael@0 | 62 | --- a/gfx/skia/src/gpu/GrReducedClip.h |
| michael@0 | 63 | +++ b/gfx/skia/src/gpu/GrReducedClip.h |
| michael@0 | 64 | @@ -1,16 +1,19 @@ |
| michael@0 | 65 | |
| michael@0 | 66 | /* |
| michael@0 | 67 | * Copyright 2012 Google Inc. |
| michael@0 | 68 | * |
| michael@0 | 69 | * Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 70 | * found in the LICENSE file. |
| michael@0 | 71 | */ |
| michael@0 | 72 | |
| michael@0 | 73 | +#ifndef GrReducedClip_DEFINED |
| michael@0 | 74 | +#define GrReducedClip_DEFINED |
| michael@0 | 75 | + |
| michael@0 | 76 | #include "SkClipStack.h" |
| michael@0 | 77 | #include "SkTLList.h" |
| michael@0 | 78 | |
| michael@0 | 79 | namespace GrReducedClip { |
| michael@0 | 80 | |
| michael@0 | 81 | typedef SkTLList<SkClipStack::Element> ElementList; |
| michael@0 | 82 | |
| michael@0 | 83 | enum InitialState { |
| michael@0 | 84 | @@ -33,8 +36,10 @@ enum InitialState { |
| michael@0 | 85 | void ReduceClipStack(const SkClipStack& stack, |
| michael@0 | 86 | const SkIRect& queryBounds, |
| michael@0 | 87 | ElementList* result, |
| michael@0 | 88 | InitialState* initialState, |
| michael@0 | 89 | SkIRect* tighterBounds = NULL, |
| michael@0 | 90 | bool* requiresAA = NULL); |
| michael@0 | 91 | |
| michael@0 | 92 | } // namespace GrReducedClip |
| michael@0 | 93 | + |
| michael@0 | 94 | +#endif |
