aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-03-13 14:41:10 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-13 19:36:12 +0000
commit7eddfb8656f8b4bb1d8011f93124e2669a2c6912 (patch)
tree3d7e7a6b0337899b7713e92ca69c2d1ee8863b29 /include
parentce14cb6797cbfd8696873373fbf04da4227080fd (diff)
consolidate SaveLayerFlag internal references
Add a third define in SkCanvasPriv to complement SkCanvas::kDontClipToLayer_PrivateSaveLayerFlag and SkCanvas::kDontClipToLayer_Legacy_SaveLayerFlag. SkCanvas::kDontClipToLayer_PrivateSaveLayerFlag exists only to define SkCanvas::kDontClipToLayer_Legacy_SaveLayerFlag and SkCanvasPriv::kDontClipToLayer_SaveLayerFlag. SkCanvas::kDontClipToLayer_Legacy_SaveLayerFlag is used only by Android framework. SkCanvasPriv::kDontClipToLayer_SaveLayerFlag is used internally. Note that changes to CanvasStateTest.cpp inside SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG aren't testable by existing skiabots; it requires building an Android framework aware version of dm. CanvasStateTest.cpp may have bit-rotted. R=reed@google.com,scroggo@google.com Bug: skia:6454,skia:7690 Change-Id: I74f2a54636fae89a5a88a7e13f1baba49d3e2115 Reviewed-on: https://skia-review.googlesource.com/112401 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/core/SkCanvas.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 6203665359..8c86cd2f13 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -2598,7 +2598,6 @@ private:
};
static bool BoundsAffectsClip(SaveLayerFlags);
- static SaveLayerFlags LegacySaveFlagsToSaveLayerFlags(uint32_t legacySaveFlags);
static void DrawDeviceWithFilter(SkBaseDevice* src, const SkImageFilter* filter,
SkBaseDevice* dst, const SkIPoint& dstOrigin,
@@ -2658,6 +2657,7 @@ private:
void internalSetMatrix(const SkMatrix&);
friend class SkAndroidFrameworkUtils;
+ friend class SkCanvasPriv; // needs kDontClipToLayer_PrivateSaveLayerFlag
friend class SkDrawIter; // needs setupDrawForLayerDevice()
friend class AutoDrawLooper;
friend class SkDebugCanvas; // needs experimental fAllowSimplifyClip
@@ -2665,7 +2665,6 @@ private:
friend class SkNoDrawCanvas; // InitFlags
friend class SkPictureImageFilter; // SkCanvas(SkBaseDevice*, SkSurfaceProps*, InitFlags)
friend class SkPictureRecord; // predrawNotify (why does it need it? <reed>)
- friend class SkPicturePlayback; // SaveFlagsToSaveLayerFlags
friend class SkOverdrawCanvas;
friend class SkRasterHandleAllocator;