Changeset 52394 in webkit

Timestamp:

Dec 19, 2009 1:35:59 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-19 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Add tests to check filter, mask, clip, opacity and marker ordering
​https://bugs.webkit.org/show_bug.cgi?id=14010

Tests the right order of filter and clipper/masker aplied to a SVG
object.

• platform/mac/svg/filters/filter-clip-expected.checksum: Added.
• platform/mac/svg/filters/filter-clip-expected.png: Added.
• platform/mac/svg/filters/filter-clip-expected.txt: Added.
• svg/filters/filter-clip.svg: Added.

2009-12-19 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Add tests to check filter, mask, clip, opacity and marker ordering
​https://bugs.webkit.org/show_bug.cgi?id=14010

The right ordering for applying effects on objects in SVG is filters,
clipper/masker and opacity. This patch fixes the order of filter and
clipper/masker. Opacity and marker need another test.
This change is according to the SVG Specification:
​http://www.w3.org/TR/SVG11/render.html#Elements

Test: svg/filters/filter-clip.svg

• rendering/SVGRenderSupport.cpp: (WebCore::SVGRenderBase::prepareToRenderSVGContent):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/filter-clip-expected.checksum (added)
• LayoutTests/platform/mac/svg/filters/filter-clip-expected.png (added)
• LayoutTests/platform/mac/svg/filters/filter-clip-expected.txt (added)
• LayoutTests/svg/filters/filter-clip.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/SVGRenderSupport.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-19  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Add tests to check filter, mask, clip, opacity and marker ordering
+        https://bugs.webkit.org/show_bug.cgi?id=14010
+
+        Tests the right order of filter and clipper/masker aplied to a SVG
+        object.
+
+        * platform/mac/svg/filters/filter-clip-expected.checksum: Added.
+        * platform/mac/svg/filters/filter-clip-expected.png: Added.
+        * platform/mac/svg/filters/filter-clip-expected.txt: Added.
+        * svg/filters/filter-clip.svg: Added.
+
 2009-12-19  Benjamin Otte  <otte@gnome.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-19  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Add tests to check filter, mask, clip, opacity and marker ordering
+        https://bugs.webkit.org/show_bug.cgi?id=14010
+
+        The right ordering for applying effects on objects in SVG is filters,
+        clipper/masker and opacity. This patch fixes the order of filter and
+        clipper/masker. Opacity and marker need another test.
+        This change is according to the SVG Specification:
+        http://www.w3.org/TR/SVG11/render.html#Elements
+
+        Test: svg/filters/filter-clip.svg
+
+        * rendering/SVGRenderSupport.cpp:
+        (WebCore::SVGRenderBase::prepareToRenderSVGContent):
+
 2009-12-19  Evan Martin  <evan@chromium.org>
 

trunk/WebCore/rendering/SVGRenderSupport.cpp

@@ -130 +130 @@
     SVGResourceMasker* masker = getMaskerById(document, maskerId);
 
+    if (masker) {
+        masker->addClient(styledElement);
+        masker->applyMask(paintInfo.context, boundingBox);
+    } else if (!maskerId.isEmpty())
+        svgElement->document()->accessSVGExtensions()->addPendingResource(maskerId, styledElement);
+
+    if (clipper) {
+        clipper->addClient(styledElement);
+        clipper->applyClip(paintInfo.context, boundingBox);
+    } else if (!clipperId.isEmpty())
+        svgElement->document()->accessSVGExtensions()->addPendingResource(clipperId, styledElement);
+
 #if ENABLE(FILTERS)
     if (filter) {
@@ -137 +149 @@
         svgElement->document()->accessSVGExtensions()->addPendingResource(filterId, styledElement);
 #endif
-
-    if (clipper) {
-        clipper->addClient(styledElement);
-        clipper->applyClip(paintInfo.context, boundingBox);
-    } else if (!clipperId.isEmpty())
-        svgElement->document()->accessSVGExtensions()->addPendingResource(clipperId, styledElement);
-
-    if (masker) {
-        masker->addClient(styledElement);
-        masker->applyMask(paintInfo.context, boundingBox);
-    } else if (!maskerId.isEmpty())
-        svgElement->document()->accessSVGExtensions()->addPendingResource(maskerId, styledElement);
 }