Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 47 matching lines @@
 #include "core/frame/animation/AnimationController.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/platform/DragImage.h"
 #include "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/ImageBuffer.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderLayerCompositor.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderView.h"
 #include "core/svg/SVGDocument.h"
+#include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/StdLibExtras.h"
 
 using namespace std;
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
@@ skipping 564 matching lines @@
 
     LayoutRect topLevelRect;
     IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
 
     float deviceScaleFactor = 1;
     if (m_page)
         deviceScaleFactor = m_page->deviceScaleFactor();
     paintingRect.setWidth(paintingRect.width() * deviceScaleFactor);
     paintingRect.setHeight(paintingRect.height() * deviceScaleFactor);
 
-    OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor));
-    if (!buffer)
+    OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(paintingRect.size(), NonOpaque, deviceScaleFactor));
+    if (!surface->isValid())
         return nullptr;
-    buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
-    buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
+    ImageBuffer buffer(surface.release());
+    buffer.context()->translate(-paintingRect.x(), -paintingRect.y());
+    buffer.context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
 
-    m_view->paintContents(buffer->context(), paintingRect);
+    m_view->paintContents(buffer.context(), paintingRect);
 
-    RefPtr<Image> image = buffer->copyImage();
+    RefPtr<Image> image = buffer.copyImage();
     return DragImage::create(image.get(), renderer->shouldRespectImageOrientation());
 }
 
 PassOwnPtr<DragImage> Frame::dragImageForSelection()
 {
     if (!selection().isRange())
         return nullptr;
 
     const ScopedFramePaintingState state(this, 0);
     m_view->setPaintBehavior(PaintBehaviorSelectionOnly | PaintBehaviorFlattenCompositingLayers);
     document()->updateLayout();
 
     IntRect paintingRect = enclosingIntRect(selection().bounds());
 
     float deviceScaleFactor = 1;
     if (m_page)
         deviceScaleFactor = m_page->deviceScaleFactor();
     paintingRect.setWidth(paintingRect.width() * deviceScaleFactor);
     paintingRect.setHeight(paintingRect.height() * deviceScaleFactor);
 
-    OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor));
-    if (!buffer)
+    OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(paintingRect.size(), NonOpaque, deviceScaleFactor));
+    if (!surface->isValid())
         return nullptr;
-    buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
-    buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
+    ImageBuffer buffer(surface.release());
+    buffer.context()->translate(-paintingRect.x(), -paintingRect.y());
+    buffer.context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
 
-    m_view->paintContents(buffer->context(), paintingRect);
+    m_view->paintContents(buffer.context(), paintingRect);
 
-    RefPtr<Image> image = buffer->copyImage();
+    RefPtr<Image> image = buffer.copyImage();
     return DragImage::create(image.get());
 }
 
 double Frame::devicePixelRatio() const
 {
     if (!m_page)
         return 0;
 
     double ratio = m_page->deviceScaleFactor();
     if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
         ratio *= pageZoomFactor();
     return ratio;
 }
 
 } // namespace WebCore