Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/rendering/svg/RenderSVGResourceFilter.cpp

Index: Source/core/rendering/svg/RenderSVGResourceFilter.cpp
diff --git a/Source/core/rendering/svg/RenderSVGResourceFilter.cpp b/Source/core/rendering/svg/RenderSVGResourceFilter.cpp
index 86881897da836d00d4f9eb005265563c15427505..3f2d568fddd250298c9e6a9069ae85d2554257c4 100644
--- a/Source/core/rendering/svg/RenderSVGResourceFilter.cpp
+++ b/Source/core/rendering/svg/RenderSVGResourceFilter.cpp
@@ -30,7 +30,9 @@
 #include "core/rendering/svg/RenderSVGResourceFilterPrimitive.h"
 #include "core/rendering/svg/SVGRenderingContext.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
+#include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/graphics/filters/SourceGraphic.h"
+#include "platform/graphics/gpu/AcceleratedImageBufferSurface.h"
 
 using namespace std;
 
@@ -115,16 +117,21 @@ bool RenderSVGResourceFilter::fitsInMaximumImageSize(const FloatSize& size, Floa
 }
 
 static bool createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform,
-    OwnPtr<ImageBuffer>& imageBuffer, RenderingMode renderingMode)
+    OwnPtr<ImageBuffer>& imageBuffer, bool accelerated)
 {
     IntRect paintRect = SVGRenderingContext::calculateImageBufferRect(targetRect, absoluteTransform);
     // Don't create empty ImageBuffers.
     if (paintRect.isEmpty())
         return false;
 
-    OwnPtr<ImageBuffer> image = ImageBuffer::create(paintRect.size(), 1, renderingMode);
-    if (!image)
+    OwnPtr<ImageBufferSurface> surface;
+    if (accelerated)
+        surface = adoptPtr(new AcceleratedImageBufferSurface(paintRect.size()));
+    if (!surface || !surface->isValid())
+        surface = adoptPtr(new UnacceleratedImageBufferSurface(paintRect.size()));
+    if (!surface->isValid())

[Stephen White, 2013/12/09 15:33:08]

NULL check here as well?

[Justin Novosad, 2013/12/09 16:37:31]

Not necessary. If the above 'new' fails, an OOM exception will crash the
process.  The previous 'if' needed a NULL ptr check for the case where
'accelerated' is false.  For clarity, I'll re-write it as if (!accelerated ||
!surface->isValid()) 

         return false;
+    OwnPtr<ImageBuffer> image = ImageBuffer::create(surface.release());
 
     GraphicsContext* imageContext = image->context();
     ASSERT(imageContext);
@@ -230,8 +237,8 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*,
     effectiveTransform.multiply(filterData->shearFreeAbsoluteTransform);
 
     OwnPtr<ImageBuffer> sourceGraphic;
-    RenderingMode renderingMode = object->document().settings()->acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
-    if (!createImageBuffer(filterData->drawingRegion, effectiveTransform, sourceGraphic, renderingMode)) {
+    bool isAccelerated = object->document().settings()->acceleratedFiltersEnabled();
+    if (!createImageBuffer(filterData->drawingRegion, effectiveTransform, sourceGraphic, isAccelerated)) {
         ASSERT(!m_filter.contains(object));
         filterData->savedContext = context;
         m_filter.set(object, filterData.release());
@@ -239,7 +246,7 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*,
     }
 
     // Set the rendering mode from the page's settings.
-    filterData->filter->setRenderingMode(renderingMode);
+    filterData->filter->setIsAccelerated(isAccelerated);
 
     GraphicsContext* sourceGraphicContext = sourceGraphic->context();
     ASSERT(sourceGraphicContext);