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

sky/engine/core/painting/PictureRecorder.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/engine/config.h"
+#include "sky/engine/core/painting/Canvas.h"
 #include "sky/engine/core/painting/PictureRecorder.h"
 
 #include "sky/engine/core/painting/Picture.h"
 
 namespace blink {
 
-PassRefPtr<PictureRecorder> PictureRecorder::create(double width, double height)
-{
-    return adoptRef(new PictureRecorder(FloatSize(width, height)));
-}
-
-PictureRecorder::PictureRecorder(const FloatSize& size)
-    : Canvas(size)
+PictureRecorder::PictureRecorder()
+    : m_pictureRecorder(adoptPtr(new SkPictureRecorder()))
 {
 }
 
 PictureRecorder::~PictureRecorder()
 {
 }
 
+bool PictureRecorder::isRecording() {
+    return m_canvas && m_canvas->isRecording();
+}
+
+SkCanvas* PictureRecorder::beginRecording(double width, double height)
+{
+    return m_pictureRecorder->beginRecording(width, height);
+}
+
 PassRefPtr<Picture> PictureRecorder::endRecording()
 {
     if (!isRecording())
         return nullptr;
-    return Picture::create(finishRecording());
+    RefPtr<Picture> picture = Picture::create(
+        adoptRef(m_pictureRecorder->endRecording()));
+    m_canvas->clearSkCanvas();
+    m_canvas = nullptr;
+    return picture.release();
 }
 
+void PictureRecorder::set_canvas(PassRefPtr<Canvas> canvas) { m_canvas = canvas; }

[abarth-chromium, 2015/06/24 01:29:33]

Usually we put trivial setters like this in the header so the compiler can
inline them.

+
 } // namespace blink