Title: [111758] branches/chromium/1025
- Revision
- 111758
- Author
- kar...@chromium.org
- Date
- 2012-03-22 14:01:56 -0700 (Thu, 22 Mar 2012)
Log Message
Revert 104848 - [chromium] Re-enable Skia feColorMatrix filter implementation.
https://bugs.webkit.org/show_bug.cgi?id=76186
Source/WebCore:
This code was landed in http://trac.webkit.org/changeset/104566 and
partially reverted in http://trac.webkit.org/changeset/104632 due
to problems with the Windows Shared builder. Those problems have
been fixed in r3006, since rolled into Chrome.
Reviewed by Kenneth Russell.
Covered by SVG feColorMatrix tests.
* WebCore.gypi:
* platform/graphics/filters/FEColorMatrix.h:
LayoutTests:
Remove suppressions for tests which now pass.
Reviewed by Kenneth Russell.
* platform/chromium/test_expectations.txt:
TBR=senorbla...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9836018
Modified Paths
Diff
Modified: branches/chromium/1025/LayoutTests/platform/chromium/test_expectations.txt (111757 => 111758)
--- branches/chromium/1025/LayoutTests/platform/chromium/test_expectations.txt 2012-03-22 20:58:15 UTC (rev 111757)
+++ branches/chromium/1025/LayoutTests/platform/chromium/test_expectations.txt 2012-03-22 21:01:56 UTC (rev 111758)
@@ -959,6 +959,15 @@
BUGWK62974 : svg/custom/svg-fonts-with-no-element-reference.html = IMAGE+TEXT IMAGE
BUGWK62974 MAC : svg/W3C-SVG-1.1/pservers-grad-08-b.svg = IMAGE
+BUGSENORBLANCO : svg/W3C-SVG-1.1/filters-color-01-b.svg = FAIL
+BUGSENORBLANCO : svg/dynamic-updates/SVGFEColorMatrixElement-dom-in-attr.html = FAIL
+BUGSENORBLANCO : svg/dynamic-updates/SVGFEColorMatrixElement-dom-type-attr.html = FAIL
+BUGSENORBLANCO : svg/dynamic-updates/SVGFEColorMatrixElement-dom-values-attr.html = FAIL
+BUGSENORBLANCO : svg/dynamic-updates/SVGFEColorMatrixElement-svgdom-in-prop.html = FAIL
+
+BUGSENORBLANCO : svg/filters/feColorMatrix-offset.svg = FAIL
+BUGSENORBLANCO : svg/filters/feColorMatrix-saturate.svg = FAIL
+
// -----------------------------------------------------------------
// End SVG Regressions
// -----------------------------------------------------------------
Modified: branches/chromium/1025/Source/WebCore/WebCore.gypi (111757 => 111758)
--- branches/chromium/1025/Source/WebCore/WebCore.gypi 2012-03-22 20:58:15 UTC (rev 111757)
+++ branches/chromium/1025/Source/WebCore/WebCore.gypi 2012-03-22 21:01:56 UTC (rev 111758)
@@ -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/FEColorMatrixSkia.cpp',
'platform/graphics/filters/skia/FEGaussianBlurSkia.cpp',
'platform/graphics/freetype/FontCacheFreeType.cpp',
'platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp',
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEColorMatrix.h (111757 => 111758)
--- branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEColorMatrix.h 2012-03-22 20:58:15 UTC (rev 111757)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/filters/FEColorMatrix.h 2012-03-22 21:01:56 UTC (rev 111758)
@@ -49,9 +49,6 @@
bool setValues(const Vector<float>&);
virtual void platformApplySoftware();
-#if USE(SKIA)
- virtual bool platformApplySkia();
-#endif
virtual void dump();
virtual TextStream& externalRepresentation(TextStream&, int indention) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
