commit 06152cdd06da50762716cd455dcf7ab0117f25b0
author Stan Iliev <stani@google.com> Wed Jul 27 17:55:43 2016 -0400
committer Stan Iliev <stani@google.com> Thu Jul 28 18:23:36 2016 -0400
tree 31e1233cbeb39f2e1268c2d4bd25b6eb149006a5
parent eadd9ca5aca0eed35f070fed6038f41e6d17ff5f

Use Canvas::create_recording_canvas instead of RecordingCanvas ctor

Modify HWUI tests to support different recording canvases. Delete
TestCanvas class and use base Canvas class instead. Use
Canvas::create_recording_canvas to create recording canvas instances
instead of RecordingCanvas constructor.

Change-Id: I651fb9bb4add0874d7110bac467a2eb1012357fc

libs/hwui/tests/unit/RenderNodeTests.cpp

diff --git a/libs/hwui/tests/unit/RenderNodeTests.cpp b/libs/hwui/tests/unit/RenderNodeTests.cpp
index 132601e..05662c1 100644
--- a/libs/hwui/tests/unit/RenderNodeTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeTests.cpp
@@ -39,11 +39,11 @@
 
 TEST(RenderNode, hasParents) {
     auto child = TestUtils::createNode(0, 0, 200, 400,
-            [](RenderProperties& props, TestCanvas& canvas) {
+            [](RenderProperties& props, Canvas& canvas) {
         canvas.drawColor(Color::Red_500, SkXfermode::kSrcOver_Mode);
     });
     auto parent = TestUtils::createNode(0, 0, 200, 400,
-            [&child](RenderProperties& props, TestCanvas& canvas) {
+            [&child](RenderProperties& props, Canvas& canvas) {
         canvas.drawRenderNode(child.get());
     });
 
@@ -52,7 +52,7 @@
     EXPECT_TRUE(child->hasParents()) << "Child node has no parent";
     EXPECT_FALSE(parent->hasParents()) << "Root node shouldn't have any parents";
 
-    TestUtils::recordNode(*parent, [](TestCanvas& canvas) {
+    TestUtils::recordNode(*parent, [](Canvas& canvas) {
         canvas.drawColor(Color::Amber_500, SkXfermode::kSrcOver_Mode);
     });
 
@@ -81,14 +81,14 @@
     Functor noopFunctor;
 
     auto node = TestUtils::createNode(0, 0, 200, 400,
-            [&](RenderProperties& props, TestCanvas& canvas) {
+            [&](RenderProperties& props, Canvas& canvas) {
         refcnt++;
         canvas.callDrawGLFunction(&noopFunctor, listener.get());
     });
     TestUtils::syncHierarchyPropertiesAndDisplayList(node);
     EXPECT_EQ(1, refcnt);
 
-    TestUtils::recordNode(*node, [&](TestCanvas& canvas) {
+    TestUtils::recordNode(*node, [&](Canvas& canvas) {
         refcnt++;
         canvas.callDrawGLFunction(&noopFunctor, listener.get());
     });
@@ -97,7 +97,7 @@
     TestUtils::syncHierarchyPropertiesAndDisplayList(node);
     EXPECT_EQ(1, refcnt);
 
-    TestUtils::recordNode(*node, [](TestCanvas& canvas) {});
+    TestUtils::recordNode(*node, [](Canvas& canvas) {});
     EXPECT_EQ(1, refcnt);
     TestUtils::syncHierarchyPropertiesAndDisplayList(node);
     EXPECT_EQ(0, refcnt);
@@ -114,7 +114,7 @@
 
     {
         auto nonNullDLNode = TestUtils::createNode(0, 0, 200, 400,
-                [](RenderProperties& props, TestCanvas& canvas) {
+                [](RenderProperties& props, Canvas& canvas) {
             canvas.drawColor(Color::Red_500, SkXfermode::kSrcOver_Mode);
         });
         TestUtils::syncHierarchyPropertiesAndDisplayList(nonNullDLNode);