diff options
| author |  Mike Reed <reed@google.com> | 2017-01-20 17:11:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-21 03:22:28 +0000 |
| commit | 288e471eda2c3648ed1c2dfe6212ad3e6b2451b3 (patch) | |
| tree | 943335714e91f208e23478b584e4d2d103338450 | |
| parent | 8ccbbb455c6ef194920c47e846b95b50f5017138 (diff) | |
clipstack is now private
BUG=skia:
Change-Id: I91e601d59eb5d46de17c280898ca01fcfab89e5c
NOTREECHECKS=True
Reviewed-on: https://skia-review.googlesource.com/7362
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
| -rw-r--r-- | gn/android_framework_defines.gni | 1 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 4 | ||||
| -rw-r--r-- | tests/CanvasTest.cpp | 16 |
3 files changed, 0 insertions, 21 deletions
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index 30c0ffedd0..b693d2808d 100644 --- a/gn/android_framework_defines.gni +++ b/gn/android_framework_defines.gni @@ -16,5 +16,4 @@ android_framework_defines = [ "SK_SUPPORT_LEGACY_SHADER_ISABITMAP", "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER", "SK_SUPPORT_EXOTIC_CLIPOPS", - "SK_SUPPORT_LEGACY_CANVAS_GETCLIPSTACK", ] diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index c259477633..6b3d6aa719 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1624,9 +1624,6 @@ private: */ bool canDrawBitmapAsSprite(SkScalar x, SkScalar y, int w, int h, const SkPaint&); -#ifdef SK_SUPPORT_LEGACY_CANVAS_GETCLIPSTACK -public: -#endif /** Return the clip stack. The clip stack stores all the individual * clips organized by the save/restore frame in which they were * added. @@ -1635,7 +1632,6 @@ public: const SkClipStack* getClipStack() const { return fClipStack.get(); } -private: /** * Keep track of the device clip bounds and if the matrix is scale-translate. This allows diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 0d2ac29505..8a619f8fad 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -187,20 +187,6 @@ private: SkCanvas* fTarget; }; -static void test_clipstack(skiatest::Reporter* reporter) { -#ifdef SK_SUPPORT_LEGACY_CANVAS_GETCLIPSTACK - // The clipstack is refcounted, and needs to be able to out-live the canvas if a client has - // ref'd it. - const SkClipStack* cs = nullptr; - { - SkCanvas canvas(10, 10); - cs = SkRef(canvas.getClipStack()); - } - REPORTER_ASSERT(reporter, cs->unique()); - cs->unref(); -#endif -} - // Format strings that describe the test context. The %s token is where // the name of the test step is inserted. The context is required for // disambiguating the error in the case of failures that are reported in @@ -532,8 +518,6 @@ static void TestOverrideStateConsistency(skiatest::Reporter* reporter, const Tes SkCanvas referenceCanvas(referenceStore); testStep->setAssertMessageFormat(kCanvasDrawAssertMessageFormat); testStep->draw(&referenceCanvas, d, reporter); - - test_clipstack(reporter); } static void test_newraster(skiatest::Reporter* reporter) { |