Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/platform/graphics/Canvas2DImageBufferSurface.h

 /*
  * Copyright (C) 2013 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
@@ skipping 10 matching lines @@
  * 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 LayerRect_h
-#define LayerRect_h
+#ifndef Canvas2DImageBufferSurface_h
+#define Canvas2DImageBufferSurface_h
 
-#include "core/dom/ClientRect.h"
-
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefCounted.h"
-#include "wtf/RefPtr.h"
-#include "wtf/text/WTFString.h"
+#include "platform/graphics/Canvas2DLayerBridge.h"
+#include "platform/graphics/ImageBufferSurface.h"
 
 namespace WebCore {
 
-class Node;
-
-class LayerRect : public RefCounted<LayerRect> {
+// This shim necessary because ImageBufferSurfaces are not allowed to be RefCounted
+class Canvas2DImageBufferSurface : public ImageBufferSurface {
 public:
-    static PassRefPtr<LayerRect> create(PassRefPtr<Node> node, const String& layerType, PassRefPtr<ClientRect> rect)
+    Canvas2DImageBufferSurface(const IntSize& size, OpacityMode opacityMode = NonOpaque, int msaaSampleCount = 1)
+        : ImageBufferSurface(size, opacityMode)
+        , m_layerBridge(Canvas2DLayerBridge::create(size, opacityMode, msaaSampleCount))
     {
-        return adoptRef(new LayerRect(node, layerType, rect));
+        clear();
     }
 
-    Node* layerRootNode() const { return m_layerRootNode.get(); }
-    String layerType() const { return m_layerType; }
-    ClientRect* layerRelativeRect() const { return m_rect.get(); }
+    virtual ~Canvas2DImageBufferSurface()
+    {
+        if (m_layerBridge)
+            m_layerBridge->beginDestruction();
+    }
+
+    // ImageBufferSurface implementation
+    virtual void willUse() OVERRIDE { m_layerBridge->willUse(); }
+    virtual SkCanvas* canvas() const OVERRIDE { return m_layerBridge->canvas(); }
+    virtual bool isValid() const OVERRIDE { return m_layerBridge && m_layerBridge->isValid(); }
+    virtual blink::WebLayer* layer() const OVERRIDE { return m_layerBridge->layer(); }
+    virtual Platform3DObject getBackingTexture() const OVERRIDE { return m_layerBridge->getBackingTexture(); }
+    virtual bool isAccelerated() const { return m_layerBridge->isAccelerated(); }
 
 private:
-    LayerRect(PassRefPtr<Node> node, const String& layerName, PassRefPtr<ClientRect> rect)
-        : m_layerRootNode(node)
-        , m_layerType(layerName)
-        , m_rect(rect)
-    {
-    }
-
-    RefPtr<Node> m_layerRootNode;
-    String m_layerType;
-    RefPtr<ClientRect> m_rect;
+    RefPtr<Canvas2DLayerBridge> m_layerBridge;
 };
 
-} // namespace WebCore
+}
 
 #endif