commit de3ce84494b55c1119ef7753162923e3fe9557bf
author Nader Jawad <njawad@google.com> Fri Nov 06 16:54:48 2020 -0800
committer Nader Jawad <njawad@google.com> Mon Nov 09 10:03:20 2020 -0800
tree a7a4b4540eb76db72baf522ab39a8d8274601ce8
parent d5c2b6d223908c1006e44b2827e43127aff8f3b2

Added support for more CanvasOps

Added support for DrawRoundRectProperty and
DrawCircleProperty canvas APIs

Test: Added tests to CanvasOpTests
Change-Id: I71bae13796c3e77f28f723339f3d06fb059cf27a

libs/hwui/canvas/CanvasOps.h

diff --git a/libs/hwui/canvas/CanvasOps.h b/libs/hwui/canvas/CanvasOps.h
index 27eca21..afd88c0 100644
--- a/libs/hwui/canvas/CanvasOps.h
+++ b/libs/hwui/canvas/CanvasOps.h
@@ -20,6 +20,7 @@
 #include <SkCanvas.h>
 #include <SkPath.h>
 #include <log/log.h>
+#include "CanvasProperty.h"
 
 #include "CanvasOpTypes.h"
 
@@ -103,6 +104,36 @@
 //   Drawing Ops
 //  ---------------------------------------------
 
+template<>
+struct CanvasOp<CanvasOpType::DrawRoundRectProperty> {
+    sp<uirenderer::CanvasPropertyPrimitive> left;
+    sp<uirenderer::CanvasPropertyPrimitive> top;
+    sp<uirenderer::CanvasPropertyPrimitive> right;
+    sp<uirenderer::CanvasPropertyPrimitive> bottom;
+    sp<uirenderer::CanvasPropertyPrimitive> rx;
+    sp<uirenderer::CanvasPropertyPrimitive> ry;
+    sp<uirenderer::CanvasPropertyPaint> paint;
+
+    void draw(SkCanvas* canvas) const {
+        SkRect rect = SkRect::MakeLTRB(left->value, top->value, right->value, bottom->value);
+        canvas->drawRoundRect(rect, rx->value, ry->value, paint->value);
+    }
+    ASSERT_DRAWABLE()
+};
+
+template<>
+struct CanvasOp<CanvasOpType::DrawCircleProperty> {
+    sp<uirenderer::CanvasPropertyPrimitive> x;
+    sp<uirenderer::CanvasPropertyPrimitive> y;
+    sp<uirenderer::CanvasPropertyPrimitive> radius;
+    sp<uirenderer::CanvasPropertyPaint> paint;
+
+    void draw(SkCanvas* canvas) const {
+        canvas->drawCircle(x->value, y->value, radius->value, paint->value);
+    }
+    ASSERT_DRAWABLE()
+};
+
 template <>
 struct CanvasOp<CanvasOpType::DrawColor> {
     SkColor4f color;