Decouple Canvas from DisplayList and map Picture and PictureRecorder more directly to their Skia co…

sky/engine/core/painting/Canvas.cpp

Index: sky/engine/core/painting/Canvas.cpp
diff --git a/sky/engine/core/painting/Canvas.cpp b/sky/engine/core/painting/Canvas.cpp
index cc9a9e5bbf193690d7a6c440123b9a69d7bcb86d..bd57eb8230ebdcb44043b64a73037b1f89aaf36b 100644
--- a/sky/engine/core/painting/Canvas.cpp
+++ b/sky/engine/core/painting/Canvas.cpp
@@ -17,11 +17,9 @@
 
 namespace blink {
 
-Canvas::Canvas(const FloatSize& size)
-    : m_size(size)
+Canvas::Canvas(SkCanvas* skCanvas)
+    : m_canvas(skCanvas)
 {
-    m_displayList = adoptRef(new DisplayList);
-    m_canvas = m_displayList->beginRecording(expandedIntSize(m_size));
 }
 
 Canvas::~Canvas()
@@ -32,7 +30,7 @@ void Canvas::save()
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->save();
 }
 
@@ -40,7 +38,7 @@ void Canvas::saveLayer(const Rect& bounds, const Paint* paint)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->saveLayer(!bounds.is_null ? &bounds.sk_rect : nullptr,
                         paint ? &paint->paint() : nullptr);
 }
@@ -49,7 +47,7 @@ void Canvas::restore()
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->restore();
 }
 
@@ -57,7 +55,7 @@ void Canvas::translate(float dx, float dy)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->translate(dx, dy);
 }
 
@@ -65,7 +63,7 @@ void Canvas::scale(float sx, float sy)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->scale(sx, sy);
 }
 
@@ -73,7 +71,7 @@ void Canvas::rotate(float radians)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->rotate(radians * 180.0/M_PI);
 }
 
@@ -81,7 +79,7 @@ void Canvas::skew(float sx, float sy)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->skew(sx, sy);
 }
 
@@ -89,7 +87,7 @@ void Canvas::concat(const Float32List& matrix4)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());

[abarth-chromium, 2015/06/18 00:03:52]

Does this function just check m_canvas for null?  If so, we should probably just
remove the call because it is redundant with the previous line.

[iansf, 2015/06/20 00:02:38]

Done.

     ASSERT(matrix4.data());
 
     // TODO(mpcomplete): how can we raise an error in this case?
@@ -113,7 +111,7 @@ void Canvas::clipRect(const Rect& rect)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->clipRect(rect.sk_rect);
 }
 
@@ -121,7 +119,7 @@ void Canvas::clipRRect(const RRect* rrect)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->clipRRect(rrect->rrect());
 }
 
@@ -129,7 +127,7 @@ void Canvas::clipPath(const CanvasPath* path)
 {
     if (!m_canvas)
         return;
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->clipPath(path->path());
 }
 
@@ -138,7 +136,7 @@ void Canvas::drawLine(float x0, float y0, float x1, float y1, const Paint* paint
     if (!m_canvas)
         return;
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawLine(x0, y0, x1, y1, paint->paint());
 }
 
@@ -147,7 +145,7 @@ void Canvas::drawPicture(Picture* picture)
     if (!m_canvas)
         return;
     ASSERT(picture);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawPicture(picture->toSkia());
 }
 
@@ -156,7 +154,7 @@ void Canvas::drawPaint(const Paint* paint)
     if (!m_canvas)
         return;
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawPaint(paint->paint());
 }
 
@@ -165,7 +163,7 @@ void Canvas::drawRect(const Rect& rect, const Paint* paint)
     if (!m_canvas)
         return;
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawRect(rect.sk_rect, paint->paint());
 }
 
@@ -175,7 +173,7 @@ void Canvas::drawRRect(const RRect* rrect, const Paint* paint)
         return;
     ASSERT(rrect);
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawRRect(rrect->rrect(), paint->paint());
 }
 
@@ -184,7 +182,7 @@ void Canvas::drawOval(const Rect& rect, const Paint* paint)
     if (!m_canvas)
         return;
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawOval(rect.sk_rect, paint->paint());
 }
 
@@ -193,7 +191,7 @@ void Canvas::drawCircle(float x, float y, float radius, const Paint* paint)
     if (!m_canvas)
         return;
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawCircle(x, y, radius, paint->paint());
 }
 
@@ -203,7 +201,7 @@ void Canvas::drawPath(const CanvasPath* path, const Paint* paint)
         return;
     ASSERT(path);
     ASSERT(paint);
-    ASSERT(m_displayList->isRecording());
+    ASSERT(isRecording());
     m_canvas->drawPath(path->path(), paint->paint());
 }
 
@@ -214,17 +212,8 @@ void Canvas::drawImage(const CanvasImage* image,
   if (!m_canvas)
     return;
   ASSERT(image);
-  ASSERT(m_displayList->isRecording());
+  ASSERT(isRecording());
   m_canvas->drawBitmap(image->bitmap(), x, y, &paint->paint());
 }
 
-PassRefPtr<DisplayList> Canvas::finishRecording()
-{
-    if (!isRecording())
-        return nullptr;
-    m_canvas = nullptr;
-    m_displayList->endRecording();
-    return m_displayList.release();
-}
-
 } // namespace blink