Index: Source/core/rendering/svg/RenderSVGResourceFilter.cpp |
diff --git a/Source/core/rendering/svg/RenderSVGResourceFilter.cpp b/Source/core/rendering/svg/RenderSVGResourceFilter.cpp |
index 927212d5c3b0b321beceacae1f3f904739421376..d8688a862b3afbd7876b1b67ef7dcbc511ebdf44 100644 |
--- a/Source/core/rendering/svg/RenderSVGResourceFilter.cpp |
+++ b/Source/core/rendering/svg/RenderSVGResourceFilter.cpp |
@@ -33,7 +33,6 @@ |
#include "platform/graphics/filters/SkiaImageFilterBuilder.h" |
#include "platform/graphics/filters/SourceAlpha.h" |
#include "platform/graphics/filters/SourceGraphic.h" |
-#include "platform/graphics/gpu/AcceleratedImageBufferSurface.h" |
using namespace std; |
@@ -117,18 +116,14 @@ void RenderSVGResourceFilter::adjustScaleForMaximumImageSize(const FloatSize& si |
filterScale.scale(sqrt(FilterEffect::maxFilterArea() / scaledArea)); |
} |
-static bool createImageBuffer(const Filter* filter, OwnPtr<ImageBuffer>& imageBuffer, bool accelerated) |
+static bool createImageBuffer(const Filter* filter, OwnPtr<ImageBuffer>& imageBuffer) |
{ |
IntRect paintRect = filter->sourceImageRect(); |
// Don't create empty ImageBuffers. |
if (paintRect.isEmpty()) |
return false; |
- OwnPtr<ImageBufferSurface> surface; |
- if (accelerated) |
- surface = adoptPtr(new AcceleratedImageBufferSurface(paintRect.size())); |
- if (!accelerated || !surface->isValid()) |
- surface = adoptPtr(new UnacceleratedImageBufferSurface(paintRect.size())); |
+ OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(paintRect.size())); |
if (!surface->isValid()) |
return false; |
OwnPtr<ImageBuffer> image = ImageBuffer::create(surface.release()); |
@@ -253,17 +248,13 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*, |
} |
OwnPtr<ImageBuffer> sourceGraphic; |
- bool isAccelerated = object->document().settings()->acceleratedFiltersEnabled(); |
- if (!createImageBuffer(filterData->filter.get(), sourceGraphic, isAccelerated)) { |
+ if (!createImageBuffer(filterData->filter.get(), sourceGraphic)) { |
ASSERT(!m_filter.contains(object)); |
filterData->savedContext = context; |
m_filter.set(object, filterData.release()); |
return false; |
} |
- // Set the rendering mode from the page's settings. |
- filterData->filter->setIsAccelerated(isAccelerated); |
- |
GraphicsContext* sourceGraphicContext = sourceGraphic->context(); |
ASSERT(sourceGraphicContext); |