Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (122008 => 122009)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-07-06 20:03:35 UTC (rev 122008)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-07-06 20:03:50 UTC (rev 122009)
@@ -1,3 +1,19 @@
+2012-04-26 Dominik Röttsches <[email protected]>
+
+ [cairo] CairoGraphicsContext fillRect (with Color) overrides composite operator
+ https://bugs.webkit.org/show_bug.cgi?id=84848
+
+ Reviewed by Martin Robinson.
+
+ Unskipping and baselining feDropShadow test,
+ now works because of composite operator fix.
+ Fixed png baseline result for drop shadow test on GTK.
+
+ * platform/efl/svg/filters/feDropShadow-expected.png: Added.
+ * platform/efl/svg/filters/feDropShadow-expected.txt: Added.
+ * platform/efl/test_expectations.txt:
+ * platform/gtk/svg/filters/feDropShadow-expected.png:
+
2012-05-04 Christophe Dumez <[email protected]>
[soup] URL of the ResourceResponse passed to willSendRequest is incorrect
Added: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/efl/svg/filters/feDropShadow-expected.txt (0 => 122009)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/platform/efl/svg/filters/feDropShadow-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/platform/efl/svg/filters/feDropShadow-expected.txt 2012-07-06 20:03:50 UTC (rev 122009)
@@ -0,0 +1,45 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (0,0) size 684x334
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGResourceFilter {filter} [id="drop-shadow-1"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="2.00, 2.00" dx="2.00" dy="2.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-2"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="0.00, 0.00" dx="0.00" dy="0.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-3"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="0.00, 10.00" dx="5.00" dy="5.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-4"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="10.00, 0.00" dx="5.00" dy="5.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-5"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="10.00, 10.00" dx="5.00" dy="5.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-6"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="10.00, 10.00" dx="-5.00" dy="-5.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-7"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="128.00, 128.00" dx="0.00" dy="0.00" flood-color="#008000" flood-opacity="1.00]
+ [SourceGraphic]
+ RenderSVGResourceFilter {filter} [id="drop-shadow-8"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
+ [feDropShadow stdDeviation="10.00, 10.00" dx="5.00" dy="5.00" flood-color="#008000" flood-opacity="0.50]
+ [SourceGraphic]
+ RenderSVGEllipse {circle} at (0,0) size 159x159 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=75.00] [cy=75.00] [r=70.00]
+ [filter="drop-shadow-1"] RenderSVGResourceFilter {filter} at (-9,-9) size 168x168
+ RenderSVGEllipse {circle} at (166,0) size 168x159 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=250.00] [cy=75.00] [r=70.00]
+ [filter="drop-shadow-2"] RenderSVGResourceFilter {filter} at (166,-9) size 168x168
+ RenderSVGEllipse {circle} at (341,0) size 168x159 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=425.00] [cy=75.00] [r=70.00]
+ [filter="drop-shadow-3"] RenderSVGResourceFilter {filter} at (341,-9) size 168x168
+ RenderSVGEllipse {circle} at (516,0) size 168x159 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=600.00] [cy=75.00] [r=70.00]
+ [filter="drop-shadow-4"] RenderSVGResourceFilter {filter} at (516,-9) size 168x168
+ RenderSVGEllipse {circle} at (0,166) size 159x168 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=75.00] [cy=250.00] [r=70.00]
+ [filter="drop-shadow-5"] RenderSVGResourceFilter {filter} at (-9,166) size 168x168
+ RenderSVGEllipse {circle} at (166,166) size 168x168 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=250.00] [cy=250.00] [r=70.00]
+ [filter="drop-shadow-6"] RenderSVGResourceFilter {filter} at (166,166) size 168x168
+ RenderSVGEllipse {circle} at (341,166) size 168x168 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=425.00] [cy=250.00] [r=70.00]
+ [filter="drop-shadow-7"] RenderSVGResourceFilter {filter} at (341,166) size 168x168
+ RenderSVGEllipse {circle} at (516,166) size 168x168 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FFFF00]}] [cx=600.00] [cy=250.00] [r=70.00]
+ [filter="drop-shadow-8"] RenderSVGResourceFilter {filter} at (516,166) size 168x168
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/efl/svg/filters/feDropShadow-expected.txt
___________________________________________________________________
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (122008 => 122009)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-07-06 20:03:35 UTC (rev 122008)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-07-06 20:03:50 UTC (rev 122009)
@@ -1,3 +1,20 @@
+2012-04-26 Dominik Röttsches <[email protected]>
+
+ [cairo] CairoGraphicsContext fillRect (with Color) overrides composite operator
+ https://bugs.webkit.org/show_bug.cgi?id=84848
+
+ Reviewed by Martin Robinson.
+
+ FillRectWithColor used to be called fillRectSourceOver before r89314
+ where this operator still made sense. The way this function is used
+ these days doesn't expect the composite operator to be overridden anymore.
+
+ No new tests, covered by existing tests, e.g.
+ svg/filters/feDropShadow.svg
+
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::fillRectWithColor):
+
2012-05-04 Dan Winship <[email protected]>
[GTK] ASSERTION FAILED: shouldLoadAsEmptyDocument(r.url()) ||
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (122008 => 122009)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2012-07-06 20:03:35 UTC (rev 122008)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2012-07-06 20:03:50 UTC (rev 122009)
@@ -77,7 +77,6 @@
return;
setSourceRGBAFromColor(cr, color);
cairo_rectangle(cr, rect.x(), rect.y(), rect.width(), rect.height());
- cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
cairo_fill(cr);
}