Title: [111763] branches/chromium/1025/Source/WebCore
- Revision
- 111763
- Author
- kar...@chromium.org
- Date
- 2012-03-22 14:15:41 -0700 (Thu, 22 Mar 2012)
Log Message
Revert 102385 - Use Skia's implementation of Gaussian blur when accelerated filters
are enabled.
https://bugs.webkit.org/show_bug.cgi?id=73949
Reviewed by Zoltan Herczeg.
In the future, this will be covered by the SVG tests run in GPU mode.
* WebCore.gypi:
Add FEGaussianBlurSkia.cpp to the build.
* platform/graphics/filters/FEGaussianBlur.cpp:
(WebCore::FEGaussianBlur::platformApplySoftware):
Call out to platformApplySkia() when USE_SKIA is enabled.
* platform/graphics/filters/FEGaussianBlur.h:
platformApplySkia() declaration.
* platform/graphics/filters/skia: Added.
* platform/graphics/filters/skia/FEGaussianBlurSkia.cpp: Added.
(WebCore::FEGaussianBlur::platformApplySkia):
On the Skia port, use SkBlurImageFilter for drawing
Gaussian blurs in accelerated mode.
* platform/graphics/skia/ImageBufferSkia.cpp:
(WebCore::ImageBuffer::copyImage):
Implement ImageBuffer::copyImage() with DontCopyBackingStore semantics.
TBR=senorbla...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9839023
Modified Paths
Diff
Modified: branches/chromium/1025/Source/WebCore/WebCore.gypi (111762 => 111763)
--- branches/chromium/1025/Source/WebCore/WebCore.gypi 2012-03-22 21:14:49 UTC (rev 111762)
+++ branches/chromium/1025/Source/WebCore/WebCore.gypi 2012-03-22 21:15:41 UTC (rev 111763)
@@ -3383,7 +3383,6 @@
'platform/graphics/filters/arm/FEGaussianBlurNEON.h',
'platform/graphics/filters/arm/FELightingNEON.cpp',
'platform/graphics/filters/arm/FELightingNEON.h',
- 'platform/graphics/filters/skia/FEGaussianBlurSkia.cpp',
'platform/graphics/freetype/FontCacheFreeType.cpp',
'platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp',
'platform/graphics/freetype/FontPlatformData.h',
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (111762 => 111763)
--- branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2012-03-22 21:14:49 UTC (rev 111762)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2012-03-22 21:15:41 UTC (rev 111763)
@@ -273,13 +273,6 @@
void FEGaussianBlur::platformApplySoftware()
{
-#if USE(SKIA)
- if (filter()->renderingMode() == Accelerated) {
- platformApplySkia();
- return;
- }
-#endif
-
FilterEffect* in = inputEffect(0);
ByteArray* srcPixelArray = createPremultipliedImageResult();
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h (111762 => 111763)
--- branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h 2012-03-22 21:14:49 UTC (rev 111762)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h 2012-03-22 21:15:41 UTC (rev 111763)
@@ -74,7 +74,6 @@
inline void platformApplyGeneric(ByteArray* srcPixelArray, ByteArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize);
inline void platformApplyNeon(ByteArray* srcPixelArray, ByteArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize);
- void platformApplySkia();
float m_stdX;
float m_stdY;
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (111762 => 111763)
--- branches/chromium/1025/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2012-03-22 21:14:49 UTC (rev 111762)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2012-03-22 21:15:41 UTC (rev 111763)
@@ -152,7 +152,8 @@
PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior) const
{
- return BitmapImageSingleFrameSkia::create(*m_data.m_platformContext.bitmap(), copyBehavior == CopyBackingStore);
+ ASSERT(copyBehavior == CopyBackingStore);
+ return BitmapImageSingleFrameSkia::create(*m_data.m_platformContext.bitmap(), true);
}
PlatformLayer* ImageBuffer::platformLayer() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
