Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/platform/graphics/ImageBufferSurface.cpp

 /*
  * 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 LayoutRectRecorder_h
-#define LayoutRectRecorder_h
+#include "config.h"
 
-#include "platform/geometry/LayoutRect.h"
-#include "wtf/Noncopyable.h"
+#include "platform/graphics/ImageBufferSurface.h"
+
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkDevice.h"
 
 namespace WebCore {
 
-class RenderLayerModelObject;
-class RenderObject;
+void ImageBufferSurface::clear()
+{
+    // Clear the background transparent or opaque, as required. It would be nice if this wasn't
+    // required, but the canvas is currently filled with the magic transparency
+    // color. Can we have another way to manage this?
+    if (isValid()) {
+        if (m_opacityMode == Opaque)
+            canvas()->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode);
+        else
+            canvas()->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
+    }
+}
 
-class LayoutRectRecorder {
-    WTF_MAKE_NONCOPYABLE(LayoutRectRecorder);
-public:
-    LayoutRectRecorder(RenderObject&, bool skipRecording = false);
-    ~LayoutRectRecorder();
+const SkBitmap& ImageBufferSurface::bitmap() const
+{
+    ASSERT(canvas());
+    return canvas()->getTopDevice()->accessBitmap(false);
+}
 
-    static bool shouldRecordLayoutRects();
-
-private:
-    RenderObject& m_object;
-    RenderLayerModelObject* m_repaintContainer;
-    unsigned m_skipRecording : 1;
-};
 
 } // namespace WebCore
-
-#endif // LayoutRectRecorder_h
-