commit d43eaa909018068bc1ac197839f5e2ed79d9139d
author Mike Reed <reed@google.com> Tue Dec 13 12:32:37 2016 -0500
committer Mike Reed <reed@google.com> Tue Dec 13 12:32:37 2016 -0500
tree 7797f6e4f475ee11ecbea9f7105d9f8c7ee64891
parent 6ae1332762295a4f2440ac8aa225c823a55383e6

SkCanvas is no longer refcnted, use SkClipOps

Change-Id: I57469f56187f1ca8624e7a63968124ee925b4c04

libs/hwui/tests/unit/FatalTestCanvas.h

diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h
index b4132b7..4831722 100644
--- a/libs/hwui/tests/unit/FatalTestCanvas.h
+++ b/libs/hwui/tests/unit/FatalTestCanvas.h
@@ -121,13 +121,13 @@
             const SkPaint*) {
         ADD_FAILURE() << "onDrawBitmapLattice not expected in this test";
     }
-    void onClipRRect(const SkRRect& rrect, ClipOp, ClipEdgeStyle) {
+    void onClipRRect(const SkRRect& rrect, SkClipOp, ClipEdgeStyle) {
         ADD_FAILURE() << "onClipRRect not expected in this test";
     }
-    void onClipPath(const SkPath& path, ClipOp, ClipEdgeStyle) {
+    void onClipPath(const SkPath& path, SkClipOp, ClipEdgeStyle) {
         ADD_FAILURE() << "onClipPath not expected in this test";
     }
-    void onClipRegion(const SkRegion& deviceRgn, ClipOp) {
+    void onClipRegion(const SkRegion& deviceRgn, SkClipOp) {
         ADD_FAILURE() << "onClipRegion not expected in this test";
     }
     void onDiscard() {

libs/hwui/tests/unit/SkiaPipelineTests.cpp

diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
index 9b5fa30..06f8693 100644
--- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp
+++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
@@ -206,7 +206,6 @@
         , mCanvas(canvas) {
     }
     SkCanvas* onNewCanvas() override {
-        mCanvas->ref();
         return mCanvas;
     }
     sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override {
@@ -216,7 +215,7 @@
         return sk_sp<SkImage>();
     }
     void onCopyOnWrite(ContentChangeMode) override {}
-    T* mCanvas;
+    T* mCanvas;  // bare pointer, not owned/ref'd
 };
 }
 
@@ -281,10 +280,10 @@
     LayerUpdateQueue layerUpdateQueue;
     SkRect dirty = SkRect::MakeWH(800, 600);
     auto pipeline = std::make_unique<SkiaOpenGLPipeline>(renderThread);
-    sk_sp<DeferTestCanvas> canvas(new DeferTestCanvas());
-    sk_sp<SkSurface> surface(new DeferLayer<DeferTestCanvas>(canvas.get()));
+    DeferTestCanvas canvas;
+    sk_sp<SkSurface> surface(new DeferLayer<DeferTestCanvas>(&canvas));
     pipeline->renderFrame(layerUpdateQueue, dirty, nodes, true, contentDrawBounds, surface);
-    EXPECT_EQ(4, canvas->mDrawCounter);
+    EXPECT_EQ(4, canvas.mDrawCounter);
 }
 
 RENDERTHREAD_TEST(SkiaPipeline, clipped) {
@@ -312,11 +311,11 @@
     LayerUpdateQueue layerUpdateQueue;
     SkRect dirty = SkRect::MakeLTRB(10, 20, 30, 40);
     auto pipeline = std::make_unique<SkiaOpenGLPipeline>(renderThread);
-    sk_sp<ClippedTestCanvas> canvas(new ClippedTestCanvas());
-    sk_sp<SkSurface> surface(new DeferLayer<ClippedTestCanvas>(canvas.get()));
+    ClippedTestCanvas canvas;
+    sk_sp<SkSurface> surface(new DeferLayer<ClippedTestCanvas>(&canvas));
     pipeline->renderFrame(layerUpdateQueue, dirty, nodes, true,
             SkRect::MakeWH(CANVAS_WIDTH, CANVAS_HEIGHT), surface);
-    EXPECT_EQ(1, canvas->mDrawCounter);
+    EXPECT_EQ(1, canvas.mDrawCounter);
 }
 
 RENDERTHREAD_TEST(SkiaPipeline, clip_replace) {
@@ -347,9 +346,9 @@
     LayerUpdateQueue layerUpdateQueue;
     SkRect dirty = SkRect::MakeLTRB(10, 10, 40, 40);
     auto pipeline = std::make_unique<SkiaOpenGLPipeline>(renderThread);
-    sk_sp<ClipReplaceTestCanvas> canvas(new ClipReplaceTestCanvas());
-    sk_sp<SkSurface> surface(new DeferLayer<ClipReplaceTestCanvas>(canvas.get()));
+    ClipReplaceTestCanvas canvas;
+    sk_sp<SkSurface> surface(new DeferLayer<ClipReplaceTestCanvas>(&canvas));
     pipeline->renderFrame(layerUpdateQueue, dirty, nodes, true,
             SkRect::MakeWH(CANVAS_WIDTH, CANVAS_HEIGHT), surface);
-    EXPECT_EQ(1, canvas->mDrawCounter);
+    EXPECT_EQ(1, canvas.mDrawCounter);
 }

libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp

diff --git a/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp b/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
index ec2efc8..e7171c8 100644
--- a/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
+++ b/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
@@ -51,7 +51,7 @@
             EXPECT_EQ(mDrawCounter++, 0);
             mCallback(*this);
         }
-        void onClipRRect(const SkRRect& rrect, ClipOp op, ClipEdgeStyle style) {
+        void onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle style) {
             SkCanvas::onClipRRect(rrect, op, style);
         }
         std::function<void(const SkCanvas&)> mCallback;
@@ -65,10 +65,10 @@
         canvas.drawRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, paint);
     });
 
-    sk_sp<PropertyTestCanvas> canvas(new PropertyTestCanvas(opValidateCallback));
-    RenderNodeDrawable drawable(node.get(), canvas.get(), true);
-    canvas->drawDrawable(&drawable);
-    EXPECT_EQ(1, canvas->mDrawCounter);
+    PropertyTestCanvas canvas(opValidateCallback);
+    RenderNodeDrawable drawable(node.get(), &canvas, true);
+    canvas.drawDrawable(&drawable);
+    EXPECT_EQ(1, canvas.mDrawCounter);
 }
 
 }