Title: [104848] trunk
- Revision
- 104848
- Author
- senorbla...@chromium.org
- Date
- 2012-01-12 12:50:25 -0800 (Thu, 12 Jan 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (104847 => 104848)
--- trunk/LayoutTests/ChangeLog 2012-01-12 20:43:02 UTC (rev 104847)
+++ trunk/LayoutTests/ChangeLog 2012-01-12 20:50:25 UTC (rev 104848)
@@ -1,3 +1,14 @@
+2012-01-12 Stephen White <senorbla...@chromium.org>
+
+ [chromium] Re-enable Skia feColorMatrix filter implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=76186
+
+ Remove suppressions for tests which now pass.
+
+ Reviewed by Kenneth Russell.
+
+ * platform/chromium/test_expectations.txt:
+
2012-01-12 Antti Koivisto <an...@apple.com>
REGRESSION(r104060): Setting user stylesheet may leave CSSStyleSelector with stale rule pointers
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104847 => 104848)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-12 20:43:02 UTC (rev 104847)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-12 20:50:25 UTC (rev 104848)
@@ -946,15 +946,6 @@
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: trunk/Source/WebCore/ChangeLog (104847 => 104848)
--- trunk/Source/WebCore/ChangeLog 2012-01-12 20:43:02 UTC (rev 104847)
+++ trunk/Source/WebCore/ChangeLog 2012-01-12 20:50:25 UTC (rev 104848)
@@ -1,3 +1,20 @@
+2012-01-12 Stephen White <senorbla...@chromium.org>
+
+ [chromium] Re-enable Skia feColorMatrix filter implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=76186
+
+ 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:
+
2012-01-12 Anders Carlsson <ander...@apple.com>
Add allowsHorizontalStretching and allowsVerticalStretching to ScrollElasticityControllerClient
Modified: trunk/Source/WebCore/WebCore.gypi (104847 => 104848)
--- trunk/Source/WebCore/WebCore.gypi 2012-01-12 20:43:02 UTC (rev 104847)
+++ trunk/Source/WebCore/WebCore.gypi 2012-01-12 20:50:25 UTC (rev 104848)
@@ -3752,6 +3752,7 @@
'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: trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.h (104847 => 104848)
--- trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.h 2012-01-12 20:43:02 UTC (rev 104847)
+++ trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.h 2012-01-12 20:50:25 UTC (rev 104848)
@@ -49,6 +49,9 @@
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
