Changeset 25372 in webkit

Timestamp:

Sep 5, 2007 1:25:30 PM (17 years ago)

Author:

zimmermann

Message:

Reviewed by Oliver.
Fix <mask> in userSpaceOnUse coordinates. Verified by new testcase taken from Batik.

Location:

branches/feature-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/batik/masking (added)
• LayoutTests/svg/batik/masking/maskRegions-expected.checksum (added)
• LayoutTests/svg/batik/masking/maskRegions-expected.png (added)
• LayoutTests/svg/batik/masking/maskRegions-expected.txt (added)
• LayoutTests/svg/batik/masking/maskRegions.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/ksvg2/svg/SVGMaskElement.cpp (modified) (3 diffs)

branches/feature-branch/LayoutTests/ChangeLog

@@ +1 @@
+2007-09-05  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Oliver.
+
+        Fix <mask> in userSpaceOnUse coordinates. Verified by new testcase taken from Batik.
+
+        * svg/batik/masking/maskRegions-expected.checksum: Added.
+        * svg/batik/masking/maskRegions-expected.png: Added.
+        * svg/batik/masking/maskRegions-expected.txt: Added.
+        * svg/batik/masking/maskRegions.svg: Added.
+
 2007-09-04  Nikolas Zimmermann  <zimmermann@kde.org>
 

branches/feature-branch/WebCore/ChangeLog

@@ +1 @@
+2007-09-05  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Oliver.
+
+        Fix <mask> in userSpaceOnUse coordinates. Verified by new testcase taken from Batik.
+
+        * ksvg2/svg/SVGMaskElement.cpp:
+        (WebCore::SVGMaskElement::drawMaskerContent):
+
 2007-09-03  Nikolas Zimmermann  <zimmermann@kde.org>
 

branches/feature-branch/WebCore/ksvg2/svg/SVGMaskElement.cpp

@@ -112 +112 @@
 {    
     // Determine specified mask size
-    float xValue = x().valueAsPercentage();
-    float yValue = y().valueAsPercentage();
-    float widthValue = width().valueAsPercentage();
-    float heightValue = height().valueAsPercentage();
-    
+    float xValue;
+    float yValue;
+    float widthValue;
+    float heightValue;
+
     if (maskUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
-        xValue *= targetRect.width();
-        yValue *= targetRect.height();
-        widthValue *= targetRect.width();
-        heightValue *= targetRect.height();
-    }
+        xValue = x().valueAsPercentage() * targetRect.width();
+        yValue = y().valueAsPercentage() * targetRect.height();
+        widthValue = width().valueAsPercentage() * targetRect.width();
+        heightValue = height().valueAsPercentage() * targetRect.height();
+    } else {
+        xValue = x().value();
+        yValue = y().value();
+        widthValue = width().value();
+        heightValue = height().value();
+    } 
 
     auto_ptr<ImageBuffer> maskImage = ImageBuffer::create(IntSize(lroundf(widthValue), lroundf(heightValue)), false);
     if (!maskImage.get())
         return maskImage;
+
     maskDestRect = FloatRect(xValue, yValue, widthValue, heightValue);
     if (maskUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
@@ -133 +139 @@
     GraphicsContext* maskImageContext = maskImage->context();
     ASSERT(maskImageContext);
-    
+
     maskImageContext->save();
     maskImageContext->translate(-xValue, -yValue);
-    
+
     if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
         maskImageContext->save();
         maskImageContext->scale(FloatSize(targetRect.width(), targetRect.height()));
     }
-    
+
     // Render subtree into ImageBuffer
     for (Node* n = firstChild(); n; n = n->nextSibling()) {
@@ -147 +153 @@
         if (!elem || !elem->isStyled())
             continue;
-        
+
         SVGStyledElement* e = static_cast<SVGStyledElement*>(elem);
         RenderObject* item = e->renderer();
         if (!item)
             continue;
-        
+
         ImageBuffer::renderSubtreeToImage(maskImage.get(), item);
     }
-    
+
     if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
         maskImageContext->restore();
-    
+
     maskImageContext->restore();
-
     return maskImage;
 }