Changeset 51496 in webkit

Timestamp:

Nov 30, 2009 9:25:00 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-30 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Complex test of mask with every combination of maskUnits and maskContentUnits
as well as different values for size and position of the mask and it's content.

• platform/mac/svg/custom/mask-with-all-units-expected.checksum: Added.
• platform/mac/svg/custom/mask-with-all-units-expected.png: Added.
• platform/mac/svg/custom/mask-with-all-units-expected.txt: Added.
• svg/custom/mask-with-all-units.svg: Added.

2009-11-30 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

REGRESSION (r49757): masking-mask-01-b.svg rendered incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=31980

It turns out, that we did not handle maskUnits="userSpaceOnUse"
correctly. We just need to move the context of the maskImage
if maskContentUnits="objectBoundingBox". The context gets scaled
on this unit combination, so we have to substract the position of
the targetRect. On userSpaceOnUse the position just depends on the
position of the mask element.
I added a test with some senseless and reasonable values for size
and postion of the mask and it's contents. I also used every
combination of maskUnits and maskContentUnits to be sure, that it
is fixed this time.

Test: svg/custom/mask-with-all-units.svg

• svg/SVGMaskElement.cpp: (WebCore::SVGMaskElement::drawMaskerContent):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/mask-with-all-units-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/mask-with-all-units-expected.png (added)
• LayoutTests/platform/mac/svg/custom/mask-with-all-units-expected.txt (added)
• LayoutTests/svg/custom/mask-with-all-units.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGMaskElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-30  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Complex test of mask with every combination of maskUnits and maskContentUnits
+        as well as different values for size and position of the mask and it's content.
+
+        * platform/mac/svg/custom/mask-with-all-units-expected.checksum: Added.
+        * platform/mac/svg/custom/mask-with-all-units-expected.png: Added.
+        * platform/mac/svg/custom/mask-with-all-units-expected.txt: Added.
+        * svg/custom/mask-with-all-units.svg: Added.
+
 2009-11-30  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-30  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        REGRESSION (r49757): masking-mask-01-b.svg rendered incorrectly
+        [https://bugs.webkit.org/show_bug.cgi?id=31980]
+
+        It turns out, that we did not handle maskUnits="userSpaceOnUse"
+        correctly. We just need to move the context of the maskImage
+        if maskContentUnits="objectBoundingBox". The context gets scaled
+        on this unit combination, so we have to substract the position of
+        the targetRect. On userSpaceOnUse the position just depends on the
+        position of the mask element.
+        I added a test with some senseless and reasonable values for size
+        and postion of the mask and it's contents. I also used every
+        combination of maskUnits and maskContentUnits to be sure, that it
+        is fixed this time.
+
+        Test: svg/custom/mask-with-all-units.svg
+
+        * svg/SVGMaskElement.cpp:
+        (WebCore::SVGMaskElement::drawMaskerContent):
+
 2009-11-30  Steve Block  <steveblock@google.com>
 

trunk/WebCore/svg/SVGMaskElement.cpp

@@ -3 +3 @@
                   2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
                   2005 Alexander Kellett <lypanov@kde.org>
+                  2009 Dirk Schulze <krit@webkit.org>
 
     This library is free software; you can redistribute it and/or
@@ -157 +158 @@
 
     FloatPoint maskContextLocation = maskDestRect.location();
-    if (maskUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+    if (maskUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
         maskDestRect.move(targetRect.x(), targetRect.y());
-
-    if (maskContentUnits() != SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
-        maskContextLocation.move(targetRect.x(), targetRect.y());
+        if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE)
+            maskContextLocation.move(targetRect.x(), targetRect.y());
+    } else {
+        if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+            maskContextLocation.move(-targetRect.x(), -targetRect.y());
+    }
 
     GraphicsContext* maskImageContext = maskImage->context();