Changeset 65889 in webkit

Timestamp:

Aug 24, 2010 4:22:12 AM (14 years ago)

Author:

Nikolas Zimmermann

Message:

2010-08-24 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Markers don't render, when applied to a target using vector-effect="non-scaling-stroke"
​https://bugs.webkit.org/show_bug.cgi?id=44511

Make fillAndStrokePath a member function of RenderPath, to avoid having to pass the const Path& and this paramters.
Don't leave the GraphicsContext mutated after applying non-scaling-stroke transformation, otherwhise markers will be renderer
in the wrong coordinate space, and thus don't show up anymore.

Test: svg/custom/non-scaling-stroke-markers.svg

• rendering/RenderPath.cpp: (WebCore::RenderPath::fillAndStrokePath): (WebCore::RenderPath::paint):
• rendering/RenderPath.h:

2010-08-24 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Markers don't render, when applied to a target using vector-effect="non-scaling-stroke"
​https://bugs.webkit.org/show_bug.cgi?id=44511

Add new test verifying that markers can be appplied to objects using vector-effect="non-scaling-stroke".

• platform/mac/svg/custom/non-scaling-stroke-markers-expected.checksum: Added.
• platform/mac/svg/custom/non-scaling-stroke-markers-expected.png: Added.
• platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt: Added.
• svg/custom/non-scaling-stroke-markers.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.png (added)
• LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt (added)
• LayoutTests/svg/custom/non-scaling-stroke-markers.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderPath.cpp (modified) (2 diffs)
• WebCore/rendering/RenderPath.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-24  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Markers don't render, when applied to a target using vector-effect="non-scaling-stroke"
+        https://bugs.webkit.org/show_bug.cgi?id=44511
+
+        Add new test verifying that markers can be appplied to objects using vector-effect="non-scaling-stroke".
+
+        * platform/mac/svg/custom/non-scaling-stroke-markers-expected.checksum: Added.
+        * platform/mac/svg/custom/non-scaling-stroke-markers-expected.png: Added.
+        * platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt: Added.
+        * svg/custom/non-scaling-stroke-markers.svg: Added.
+
 2010-08-24  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Markers don't render, when applied to a target using vector-effect="non-scaling-stroke"
+        https://bugs.webkit.org/show_bug.cgi?id=44511
+
+        Make fillAndStrokePath a member function of RenderPath, to avoid having to pass the const Path& and this paramters.
+        Don't leave the GraphicsContext mutated after applying non-scaling-stroke transformation, otherwhise markers will be renderer
+        in the wrong coordinate space, and thus don't show up anymore.
+
+        Test: svg/custom/non-scaling-stroke-markers.svg
+
+        * rendering/RenderPath.cpp:
+        (WebCore::RenderPath::fillAndStrokePath):
+        (WebCore::RenderPath::paint):
+        * rendering/RenderPath.h:
+
 2010-08-24  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/rendering/RenderPath.cpp

@@ -128 +128 @@
 }
 
-static inline void fillAndStrokePath(const Path& path, GraphicsContext* context, RenderPath* object)
+void RenderPath::fillAndStrokePath(GraphicsContext* context)
 {
     context->beginPath();
-    RenderStyle* style = object->style();
-
-    if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(object, style)) {
-        context->addPath(path);
-        if (fillPaintingResource->applyResource(object, style, context, ApplyToFillMode))
-            fillPaintingResource->postApplyResource(object, context, ApplyToFillMode);
-    }
-
-    if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(object, style)) {
-        if (style->svgStyle()->vectorEffect() == VE_NON_SCALING_STROKE) {
-            SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(object->node());
-            AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
-            if (!transform.isInvertible())
-                return;
-
-            Path transformedPath = path;
-            context->concatCTM(transform.inverse());
-            transformedPath.transform(transform);
-            context->addPath(transformedPath);
-        } else
-            context->addPath(path);
-        if (strokePaintingResource->applyResource(object, style, context, ApplyToStrokeMode))
-            strokePaintingResource->postApplyResource(object, context, ApplyToStrokeMode);
-    }
+    RenderStyle* style = this->style();
+
+    if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(this, style)) {
+        context->addPath(m_path);
+        if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode))
+            fillPaintingResource->postApplyResource(this, context, ApplyToFillMode);
+    }
+
+    RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(this, style);
+    if (!strokePaintingResource)
+        return;
+
+    bool restoreContext = false;
+    if (style->svgStyle()->vectorEffect() == VE_NON_SCALING_STROKE) {
+        SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(node());
+        AffineTransform nonScalingStrokeTransform = element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
+        if (!nonScalingStrokeTransform.isInvertible())
+            return;
+
+        Path transformedPath = m_path;
+        transformedPath.transform(nonScalingStrokeTransform);
+
+        context->save();
+        context->concatCTM(nonScalingStrokeTransform.inverse());
+        context->addPath(transformedPath);
+        restoreContext = true;
+    } else
+        context->addPath(m_path);
+
+    if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode))
+        strokePaintingResource->postApplyResource(this, context, ApplyToStrokeMode);
+
+    if (restoreContext)
+        context->restore();
 }
 
@@ -181 +191 @@
                     childPaintInfo.context->setShouldAntialias(false);
 
-                fillAndStrokePath(m_path, childPaintInfo.context, this);
+                fillAndStrokePath(childPaintInfo.context);
 
                 if (svgStyle->hasMarkers())

trunk/WebCore/rendering/RenderPath.h

@@ -71 +71 @@
 private:
     virtual AffineTransform localTransform() const { return m_localTransform; }
+    void fillAndStrokePath(GraphicsContext*);
 
     bool m_needsBoundariesUpdate : 1;