commit 2c9e20055be772feb3f44986c1af0c0a979eff49
author reed <reed@google.com> Mon Jul 25 08:05:22 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 25 08:05:23 2016 -0700
tree 7c32fff13c4558094c16220a7f2547ff8fd9a3d2
parent d0e95a524c20932e0f4e68bab43995188a281395

remove fClipStack and attach/deattach-from-canvas

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2180793002

Review-Url: https://codereview.chromium.org/2180793002

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 88f5847..602396f 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -287,30 +287,12 @@
     return false;
 }
 
-void SkGpuDevice::onAttachToCanvas(SkCanvas* canvas) {
-    ASSERT_SINGLE_OWNER
-    INHERITED::onAttachToCanvas(canvas);
-
-    // Canvas promises that this ptr is valid until onDetachFromCanvas is called
-    fClipStack.reset(SkRef(canvas->getClipStack()));
-}
-
-void SkGpuDevice::onDetachFromCanvas() {
-    ASSERT_SINGLE_OWNER
-    INHERITED::onDetachFromCanvas();
-    fClip.reset();
-    fClipStack.reset(nullptr);
-}
-
 // call this every draw call, to ensure that the context reflects our state,
 // and not the state from some other canvas/device
 void SkGpuDevice::prepareDraw(const SkDraw& draw) {
     ASSERT_SINGLE_OWNER
-    SkASSERT(fClipStack.get());
 
-    SkASSERT(draw.fClipStack && draw.fClipStack == fClipStack);
-
-    fClip.reset(fClipStack, &this->getOrigin());
+    fClip.reset(draw.fClipStack, &this->getOrigin());
 }
 
 GrDrawContext* SkGpuDevice::accessDrawContext() {