Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Issue 9837019: Revert 104566 - Source/WebCore: [Skia] Switch FEColorMatrix to use a skia-based implementation when (Closed)

Created:
8 years, 9 months ago by karen
Modified:
8 years, 9 months ago
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Visibility:
Public.

Description

Revert 104566 - Source/WebCore: [Skia] Switch FEColorMatrix to use a skia-based implementation when compiling with USE(SKIA). This change will also switch the software implementation of FEGaussianBlur to the skia implementation (ie., it removes the acceleration check). https://bugs.webkit.org/show_bug.cgi?id=75582 Reviewed by Dirk Schulze. Covered by svg/W3C-SVG-1.1/filters-color-01-b.svg and friends (will need a rebaseline). * WebCore.gypi: Add FEColorMatrixSkia.cpp to the build. * platform/graphics/filters/FEColorMatrix.h: Add platformApplySkia(). * platform/graphics/filters/FEGaussianBlur.cpp: (WebCore::FEGaussianBlur::platformApplySoftware): Remove skia-specific code from FEGaussianBlur::platformApplySoftware(). * platform/graphics/filters/FEGaussianBlur.h: Make platformApplySkia() virtual, and put it behind #if USE(SKIA). * platform/graphics/filters/FilterEffect.cpp: (WebCore::FilterEffect::apply): Call out to platformApplySkia(), or fall back to platformApplySoftware(). * platform/graphics/filters/FilterEffect.h: Add platformApplySkia(). * platform/graphics/filters/skia/FEColorMatrixSkia.cpp: Added. (WebCore::saturateMatrix): (WebCore::hueRotateMatrix): (WebCore::luminanceToAlphaMatrix): (WebCore::FEColorMatrix::platformApplySkia): Process color matrix effect, by calling out to generic matrix version of SkColorMatrixFilter. * platform/graphics/filters/skia/FEGaussianBlurSkia.cpp: (WebCore::FEGaussianBlur::platformApplySkia): Change the signature of FEGaussianBlur::platformApplySkia to be an override of the new FilterEffect base class version. LayoutTests: [chomium] Mark svg FEColorMatrix tests as needing new baselines. https://bugs.webkit.org/show_bug.cgi?id=75582 Reviewed by Dirk Schulze. * platform/chromium/test_expectations.txt: TBR=senorblanco@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=111760

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+11 lines, -17 lines) Patch
M Source/WebCore/WebCore.gypi View 1 chunk +0 lines, -1 line 0 comments Download
M Source/WebCore/platform/graphics/filters/FEColorMatrix.h View 1 chunk +0 lines, -3 lines 0 comments Download
M Source/WebCore/platform/graphics/filters/FEGaussianBlur.h View 1 chunk +1 line, -3 lines 0 comments Download
M Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp View 1 chunk +7 lines, -0 lines 0 comments Download
M Source/WebCore/platform/graphics/filters/FilterEffect.h View 1 chunk +0 lines, -3 lines 0 comments Download
M Source/WebCore/platform/graphics/filters/FilterEffect.cpp View 1 chunk +0 lines, -4 lines 0 comments Download
M Source/WebCore/platform/graphics/filters/skia/FEGaussianBlurSkia.cpp View 2 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
karen
8 years, 9 months ago (2012-03-22 21:08:22 UTC) #1
senorblanco
8 years, 9 months ago (2012-03-22 21:09:09 UTC) #2
lgtm

Powered by Google App Engine
This is Rietveld 408576698