Initial implementation of display list backed 2D canvases

Source/platform/graphics/RecordingImageBufferSurface.h

 /*
- * Copyright (c) 2013, Google Inc. All rights reserved.
+ * Copyright (c) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef UnacceleratedImageBufferSurface_h
-#define UnacceleratedImageBufferSurface_h
+#ifndef RecordingImageBufferSurface_h
+#define RecordingImageBufferSurface_h
 
 #include "platform/graphics/ImageBufferSurface.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 
+class SkPicture;
+class SkPictureRecorder;
+
 namespace WebCore {
 
-class PLATFORM_EXPORT UnacceleratedImageBufferSurface : public ImageBufferSurface {
-    WTF_MAKE_NONCOPYABLE(UnacceleratedImageBufferSurface); WTF_MAKE_FAST_ALLOCATED;
+class PLATFORM_EXPORT RecordingImageBufferSurface : public ImageBufferSurface {
+    WTF_MAKE_NONCOPYABLE(RecordingImageBufferSurface); WTF_MAKE_FAST_ALLOCATED;
 public:
-    UnacceleratedImageBufferSurface(const IntSize&, OpacityMode = NonOpaque);
-    virtual ~UnacceleratedImageBufferSurface() { }
+    RecordingImageBufferSurface(const IntSize&, OpacityMode = NonOpaque);
+    virtual ~RecordingImageBufferSurface();
 
-    virtual SkCanvas* canvas() const OVERRIDE { return m_canvas.get(); }
-    virtual bool isValid() const OVERRIDE { return m_canvas; }
+    virtual SkCanvas* canvas() const OVERRIDE;
+    virtual PassRefPtr<SkPicture> getPicture() OVERRIDE;
+    virtual bool isValid() const OVERRIDE { return true; }
+    virtual void willReadback() OVERRIDE;
+    virtual void didClearCanvas() OVERRIDE;
+    virtual void setImageBuffer(ImageBuffer*) OVERRIDE;
 
 private:
-    RefPtr<SkCanvas> m_canvas;
+    void fallbackToRasterCanvas();

[Stephen White, 2014/07/09 20:04:08]

Bikeshed: "fallback" is a noun; I'd use "fallBackToRasterCanvas" here.

[Justin Novosad, 2014/07/11 21:16:08]

Done.

[Stephen White, 2014/07/14 15:19:15]

Still seems to be "fallback" in the lastest patch?

[Justin Novosad, 2014/07/17 18:34:14]

I changed it everywhere else LOL. That's why all the try jobs failed.

+    void initializeCurrentFrame();
+    bool handleOpaqueFrame();
+
+    OwnPtr<SkPictureRecorder> m_currentFrame;
+    RefPtr<SkPicture> m_previousFrame;
+    OwnPtr<SkCanvas> m_rasterCanvas;
+    ImageBuffer* m_imageBuffer;
+    bool m_frameWasCleared;
 };
 
 } // namespace WebCore
 
 #endif