1 files changed, 52 insertions, 14 deletions

diff --git a/libs/hwui/tests/unit/RenderNodeTests.cpp b/libs/hwui/tests/unit/RenderNodeTests.cpp
index cf76a8691dcd..331a6acc1268 100644
--- a/libs/hwui/tests/unit/RenderNodeTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeTests.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <gtest/gtest.h>
+#include <VectorDrawable.h>
 
 #include "AnimationContext.h"
 #include "DamageAccumulator.h"
@@ -39,11 +40,11 @@ public:
 
 TEST(RenderNode, hasParents) {
     auto child = TestUtils::createNode(0, 0, 200, 400,
-            [](RenderProperties& props, TestCanvas& canvas) {
-        canvas.drawColor(Color::Red_500, SkXfermode::kSrcOver_Mode);
+            [](RenderProperties& props, Canvas& canvas) {
+        canvas.drawColor(Color::Red_500, SkBlendMode::kSrcOver);
     });
     auto parent = TestUtils::createNode(0, 0, 200, 400,
-            [&child](RenderProperties& props, TestCanvas& canvas) {
+            [&child](RenderProperties& props, Canvas& canvas) {
         canvas.drawRenderNode(child.get());
     });
 
@@ -52,8 +53,8 @@ TEST(RenderNode, hasParents) {
     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) {
-        canvas.drawColor(Color::Amber_500, SkXfermode::kSrcOver_Mode);
+    TestUtils::recordNode(*parent, [](Canvas& canvas) {
+        canvas.drawColor(Color::Amber_500, SkBlendMode::kSrcOver);
     });
 
     EXPECT_TRUE(child->hasParents()) << "Child should still have a parent";
@@ -68,7 +69,7 @@ TEST(RenderNode, hasParents) {
 TEST(RenderNode, releasedCallback) {
     class DecRefOnReleased : public GlFunctorLifecycleListener {
     public:
-        DecRefOnReleased(int* refcnt) : mRefCnt(refcnt) {}
+        explicit DecRefOnReleased(int* refcnt) : mRefCnt(refcnt) {}
         void onGlFunctorReleased(Functor* functor) override {
             *mRefCnt -= 1;
         }
@@ -81,14 +82,14 @@ TEST(RenderNode, releasedCallback) {
     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,24 +98,26 @@ TEST(RenderNode, releasedCallback) {
     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);
 }
 
 RENDERTHREAD_TEST(RenderNode, prepareTree_nullableDisplayList) {
+    auto rootNode = TestUtils::createNode(0, 0, 200, 400, nullptr);
     ContextFactory contextFactory;
-    CanvasContext canvasContext(renderThread, false, nullptr, &contextFactory);
-    TreeInfo info(TreeInfo::MODE_RT_ONLY, canvasContext);
+    std::unique_ptr<CanvasContext> canvasContext(CanvasContext::create(
+            renderThread, false, rootNode.get(), &contextFactory));
+    TreeInfo info(TreeInfo::MODE_RT_ONLY, *canvasContext.get());
     DamageAccumulator damageAccumulator;
     info.damageAccumulator = &damageAccumulator;
     info.observer = nullptr;
 
     {
         auto nonNullDLNode = TestUtils::createNode(0, 0, 200, 400,
-                [](RenderProperties& props, TestCanvas& canvas) {
-            canvas.drawColor(Color::Red_500, SkXfermode::kSrcOver_Mode);
+                [](RenderProperties& props, Canvas& canvas) {
+            canvas.drawColor(Color::Red_500, SkBlendMode::kSrcOver);
         });
         TestUtils::syncHierarchyPropertiesAndDisplayList(nonNullDLNode);
         EXPECT_TRUE(nonNullDLNode->getDisplayList());
@@ -128,5 +131,40 @@ RENDERTHREAD_TEST(RenderNode, prepareTree_nullableDisplayList) {
         nullDLNode->prepareTree(info);
     }
 
-    canvasContext.destroy(nullptr);
+    canvasContext->destroy(nullptr);
+}
+
+RENDERTHREAD_TEST(RenderNode, prepareTree_HwLayer_AVD_enqueueDamage) {
+
+    VectorDrawable::Group* group = new VectorDrawable::Group();
+    VectorDrawableRoot* vectorDrawable = new VectorDrawableRoot(group);
+    auto rootNode = TestUtils::createNode(0, 0, 200, 400,
+            [&](RenderProperties& props, Canvas& canvas) {
+        canvas.drawVectorDrawable(vectorDrawable);
+    });
+    ContextFactory contextFactory;
+    std::unique_ptr<CanvasContext> canvasContext(CanvasContext::create(
+            renderThread, false, rootNode.get(), &contextFactory));
+    TreeInfo info(TreeInfo::MODE_RT_ONLY, *canvasContext.get());
+    DamageAccumulator damageAccumulator;
+    LayerUpdateQueue layerUpdateQueue;
+    info.damageAccumulator = &damageAccumulator;
+    info.layerUpdateQueue = &layerUpdateQueue;
+    info.observer = nullptr;
+
+    // Put node on HW layer
+    rootNode->mutateStagingProperties().mutateLayerProperties().setType(LayerType::RenderLayer);
+
+    TestUtils::syncHierarchyPropertiesAndDisplayList(rootNode);
+    rootNode->prepareTree(info);
+
+    // Check that the VD is in the dislay list, and the layer update queue contains the correct
+    // damage rect.
+    EXPECT_TRUE(rootNode->getDisplayList()->hasVectorDrawables());
+    EXPECT_FALSE(info.layerUpdateQueue->entries().empty());
+    EXPECT_EQ(rootNode.get(), info.layerUpdateQueue->entries().at(0).renderNode);
+    EXPECT_EQ(uirenderer::Rect(0, 0, 200, 400), info.layerUpdateQueue->entries().at(0).damage);
+
+    delete vectorDrawable;
+    canvasContext->destroy(nullptr);
 }