diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-03-13 14:41:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-13 19:36:12 +0000 |
| commit | 7eddfb8656f8b4bb1d8011f93124e2669a2c6912 (patch) | |
| tree | 3d7e7a6b0337899b7713e92ca69c2d1ee8863b29 /src/pipe | |
| parent | ce14cb6797cbfd8696873373fbf04da4227080fd (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 'src/pipe')
| -rw-r--r-- | src/pipe/SkPipeCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/pipe/SkPipeReader.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index 7315f88dd4..911595c47c 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -226,8 +226,8 @@ SkCanvas::SaveLayerStrategy SkPipeCanvas::getSaveLayerStrategy(const SaveLayerRe uint32_t extra = rec.fSaveLayerFlags; // remap this wacky flag - if (extra & (1 << 31)/*SkCanvas::kDontClipToLayer_PrivateSaveLayerFlag*/) { - extra &= ~(1 << 31); + if (extra & SkCanvasPriv::kDontClipToLayer_SaveLayerFlag) { + extra &= ~SkCanvasPriv::kDontClipToLayer_SaveLayerFlag; extra |= kDontClipToLayer_SaveLayerMask; } diff --git a/src/pipe/SkPipeReader.cpp b/src/pipe/SkPipeReader.cpp index 2c41453868..2614c4ecd5 100644 --- a/src/pipe/SkPipeReader.cpp +++ b/src/pipe/SkPipeReader.cpp @@ -246,7 +246,7 @@ static void saveLayer_handler(SkPipeReader& reader, uint32_t packedVerb, SkCanva // unremap this wacky flag if (extra & kDontClipToLayer_SaveLayerMask) { - flags |= (1 << 31);//SkCanvas::kDontClipToLayer_PrivateSaveLayerFlag; + flags |= SkCanvasPriv::kDontClipToLayer_SaveLayerFlag; } canvas->saveLayer(SkCanvas::SaveLayerRec(bounds, paint, backdrop.get(), clipMask.get(), |