Changeset 60858 in webkit

Timestamp:

Jun 8, 2010 12:11:11 PM (14 years ago)

Author:

krit@webkit.org

Message:

2010-06-08 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Implement non-scaling-stroke (from SVG Tiny 1.2, also in Opera)
​https://bugs.webkit.org/show_bug.cgi?id=31438

This is the implementation of the SVG property vector-effect according
to the specification of SVG Tiny 1.2.
getScreenCTM() was not able to calculate the transformation matrix in
comparison to the host coordinate system for objects, that get refereced
by a use element. This is fixed and covered by the the new test as well.
This patch is based upon a patch of Jeff Schiller.

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

• css/CSSComputedStyleDeclaration.cpp: Added CSSPropertyVectorEffect. (WebCore::):
• css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): (WebCore::CSSPrimitiveValue::operator EVectorEffect):
• css/SVGCSSComputedStyleDeclaration.cpp: (WebCore::CSSComputedStyleDeclaration::getSVGPropertyCSSValue):
• css/SVGCSSParser.cpp: (WebCore::CSSParser::parseSVGValue):
• css/SVGCSSPropertyNames.in:
• css/SVGCSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applySVGProperty):
• css/SVGCSSValueKeywords.in: Add vector-effect value non-scaling-stroke.
• rendering/RenderPath.cpp: Revert transformations to ctm and transform path instead. (WebCore::fillAndStrokePath):
• rendering/RenderSVGResourceContainer.h: (WebCore::RenderSVGResourceContainer::transformOnNonScalingStroke):
• rendering/RenderSVGResourceGradient.cpp: Transform the gradient with the screenCTM. (WebCore::RenderSVGResourceGradient::applyResource):
• rendering/RenderSVGResourcePattern.cpp: Transform the pattern with the screenCTM. (WebCore::RenderSVGResourcePattern::applyResource):
• rendering/style/SVGRenderStyle.h: Added vector-effect property, not interited. (WebCore::SVGRenderStyle::NonInheritedFlags::): (WebCore::SVGRenderStyle::setBitDefaults):
• rendering/style/SVGRenderStyleDefs.h: Added enums for vector-effect. (WebCore::):
• svg/SVGLocatable.cpp: Calculate screenCTM for <use> referenced objects. (WebCore::SVGLocatable::computeCTM):
• svg/SVGStyledElement.cpp: (WebCore::SVGStyledElement::cssPropertyIdForSVGAttributeName):
• svg/svgattrs.in:

2010-06-08 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Implement non-scaling-stroke (from SVG Tiny 1.2, also in Opera)
​https://bugs.webkit.org/show_bug.cgi?id=31438

Test for SVG property vector-effect. The stroke-width should not get influenced by
any transformation on the object or its parrent.

• platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
• platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• platform/mac/svg/custom/non-scaling-stroke-expected.checksum: Added.
• platform/mac/svg/custom/non-scaling-stroke-expected.png: Added.
• platform/mac/svg/custom/non-scaling-stroke-expected.txt: Added.
• svg/css/getComputedStyle-basic-expected.txt:
• svg/custom/non-scaling-stroke.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/non-scaling-stroke-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/non-scaling-stroke-expected.png (added)
• LayoutTests/platform/mac/svg/custom/non-scaling-stroke-expected.txt (added)
• LayoutTests/svg/css/getComputedStyle-basic-expected.txt (modified) (2 diffs)
• LayoutTests/svg/custom/non-scaling-stroke.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• WebCore/css/CSSPrimitiveValueMappings.h (modified) (2 diffs)
• WebCore/css/SVGCSSComputedStyleDeclaration.cpp (modified) (1 diff)
• WebCore/css/SVGCSSParser.cpp (modified) (1 diff)
• WebCore/css/SVGCSSPropertyNames.in (modified) (1 diff)
• WebCore/css/SVGCSSStyleSelector.cpp (modified) (1 diff)
• WebCore/css/SVGCSSValueKeywords.in (modified) (1 diff)
• WebCore/rendering/RenderPath.cpp (modified) (2 diffs)
• WebCore/rendering/RenderSVGResourceContainer.h (modified) (2 diffs)
• WebCore/rendering/RenderSVGResourceGradient.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGResourcePattern.cpp (modified) (1 diff)
• WebCore/rendering/style/SVGRenderStyle.h (modified) (3 diffs)
• WebCore/rendering/style/SVGRenderStyleDefs.h (modified) (1 diff)
• WebCore/svg/SVGLocatable.cpp (modified) (1 diff)
• WebCore/svg/SVGStyledElement.cpp (modified) (1 diff)
• WebCore/svg/svgattrs.in (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-08  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Implement non-scaling-stroke (from SVG Tiny 1.2, also in Opera)
+        https://bugs.webkit.org/show_bug.cgi?id=31438
+        
+        Test for SVG property vector-effect. The stroke-width should not get influenced by
+        any transformation on the object or its parrent.
+
+        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/mac/svg/custom/non-scaling-stroke-expected.checksum: Added.
+        * platform/mac/svg/custom/non-scaling-stroke-expected.png: Added.
+        * platform/mac/svg/custom/non-scaling-stroke-expected.txt: Added.
+        * svg/css/getComputedStyle-basic-expected.txt:
+        * svg/custom/non-scaling-stroke.svg: Added.
+
 2010-06-08  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt

@@ -210 +210 @@
 glyph-orientation-vertical: auto;
 -webkit-svg-shadow: none;
+vector-effect: none;
 
 Other attributes that the computed style class supports:

trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

@@ -209 +209 @@
     glyph-orientation-vertical: auto
     -webkit-svg-shadow: none
+    vector-effect: none
     background-position-x: 0%
     background-position-y: 0%

trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

@@ -417 +417 @@
 rect: style.getPropertyValue(-webkit-svg-shadow) : none
 rect: style.getPropertyCSSValue(-webkit-svg-shadow) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(vector-effect) : none
+rect: style.getPropertyCSSValue(vector-effect) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(background-attachment) : scroll
 g: style.getPropertyCSSValue(background-attachment) : [object CSSPrimitiveValue]
@@ -835 +837 @@
 g: style.getPropertyValue(-webkit-svg-shadow) : none
 g: style.getPropertyCSSValue(-webkit-svg-shadow) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(vector-effect) : none
+g: style.getPropertyCSSValue(vector-effect) : [object CSSPrimitiveValue]
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-08  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Implement non-scaling-stroke (from SVG Tiny 1.2, also in Opera)
+        https://bugs.webkit.org/show_bug.cgi?id=31438
+        
+        This is the implementation of the SVG property vector-effect according
+        to the specification of SVG Tiny 1.2.
+        getScreenCTM() was not able to calculate the transformation matrix in
+        comparison to the host coordinate system for objects, that get refereced
+        by a use element. This is fixed and covered by the the new test as well.
+        This patch is based upon a patch of Jeff Schiller.
+
+        Test: svg/custom/non-scaling-stroke.svg
+
+        * css/CSSComputedStyleDeclaration.cpp: Added CSSPropertyVectorEffect.
+        (WebCore::):
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator EVectorEffect):
+        * css/SVGCSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getSVGPropertyCSSValue):
+        * css/SVGCSSParser.cpp:
+        (WebCore::CSSParser::parseSVGValue):
+        * css/SVGCSSPropertyNames.in:
+        * css/SVGCSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applySVGProperty):
+        * css/SVGCSSValueKeywords.in: Add vector-effect value non-scaling-stroke.
+        * rendering/RenderPath.cpp: Revert transformations to ctm and transform path instead.
+        (WebCore::fillAndStrokePath):
+        * rendering/RenderSVGResourceContainer.h:
+        (WebCore::RenderSVGResourceContainer::transformOnNonScalingStroke):
+        * rendering/RenderSVGResourceGradient.cpp: Transform the gradient with the screenCTM.
+        (WebCore::RenderSVGResourceGradient::applyResource):
+        * rendering/RenderSVGResourcePattern.cpp: Transform the pattern with the screenCTM.
+        (WebCore::RenderSVGResourcePattern::applyResource):
+        * rendering/style/SVGRenderStyle.h: Added vector-effect property, not interited.
+        (WebCore::SVGRenderStyle::NonInheritedFlags::):
+        (WebCore::SVGRenderStyle::setBitDefaults):
+        * rendering/style/SVGRenderStyleDefs.h: Added enums for vector-effect.
+        (WebCore::):
+        * svg/SVGLocatable.cpp: Calculate screenCTM for <use> referenced objects.
+        (WebCore::SVGLocatable::computeCTM):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::cssPropertyIdForSVGAttributeName):
+        * svg/svgattrs.in:
+
 2010-06-08  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -265 +265 @@
     CSSPropertyGlyphOrientationHorizontal,
     CSSPropertyGlyphOrientationVertical,
-    CSSPropertyWebkitSvgShadow
+    CSSPropertyWebkitSvgShadow,
+    CSSPropertyVectorEffect
 #endif
 };

trunk/WebCore/css/CSSPrimitiveValueMappings.h

@@ -3 +3 @@
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
+ * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2600 +2602 @@
 }
 
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVectorEffect e)
+    : m_type(CSS_IDENT)
+    , m_hasCachedCSSText(false)
+{
+    switch (e) {
+    case VE_NONE:
+        m_value.ident = CSSValueNone;
+        break;
+    case VE_NON_SCALING_STROKE:
+        m_value.ident = CSSValueNonScalingStroke;
+        break;
+    }
+}
+
+template<> inline CSSPrimitiveValue::operator EVectorEffect() const
+{
+    switch (m_value.ident) {
+    case CSSValueNone:
+        return VE_NONE;
+    case CSSValueNonScalingStroke:
+        return VE_NON_SCALING_STROKE;
+    default:
+        ASSERT_NOT_REACHED();
+        return VE_NONE;
+    }
+}
+
 #endif
 

trunk/WebCore/css/SVGCSSComputedStyleDeclaration.cpp

@@ -169 +169 @@
         case CSSPropertyWebkitSvgShadow:
             return valueForShadow(svgStyle->shadow(), propertyID);
+        case CSSPropertyVectorEffect:
+            return CSSPrimitiveValue::create(svgStyle->vectorEffect());
         case CSSPropertyMarker:
         case CSSPropertyEnableBackground:

trunk/WebCore/css/SVGCSSParser.cpp

@@ -221 +221 @@
             m_valueList->next();
 
+        break;
+        
+    case CSSPropertyVectorEffect: // none | non-scaling-stroke | inherit
+        if (id == CSSValueNone || id == CSSValueNonScalingStroke)
+            valid_primitive = true;
         break;
 

trunk/WebCore/css/SVGCSSPropertyNames.in

@@ -46 +46 @@
 kerning
 text-anchor
+vector-effect
 writing-mode
 

trunk/WebCore/css/SVGCSSStyleSelector.cpp

@@ -553 +553 @@
             return;
         }
+        case CSSPropertyVectorEffect: {
+            HANDLE_INHERIT_AND_INITIAL(vectorEffect, VectorEffect)
+            if (!primitiveValue)
+                break;
+
+            svgstyle->setVectorEffect(*primitiveValue);
+            break;
+        }
         default:
             // If you crash here, it's because you added a css property and are not handling it

trunk/WebCore/css/SVGCSSValueKeywords.in

@@ -274 +274 @@
 # end
 
+# CSS_PROP_VECTOR_EFFECT
+# none
+non-scaling-stroke
+
+
 # CSS_PROP_WRITING_MODE
 lr-tb

trunk/WebCore/rendering/RenderPath.cpp

@@ -6 +6 @@
                   2009 Dirk Schulze <krit@webkit.org>
     Copyright (C) Research In Motion Limited 2010. All rights reserved.
+                  2009 Jeff Schiller <codedread@gmail.com>
 
     This library is free software; you can redistribute it and/or
@@ -132 +133 @@
 {
     context->beginPath();
-
-    if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(object, object->style())) {
+    RenderStyle* style = object->style();
+
+    if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(object, style)) {
         context->addPath(path);
-        if (fillPaintingResource->applyResource(object, object->style(), context, ApplyToFillMode))
+        if (fillPaintingResource->applyResource(object, style, context, ApplyToFillMode))
             fillPaintingResource->postApplyResource(object, context, ApplyToFillMode);
     }
 
-    if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(object, object->style())) {
-        context->addPath(path);
-        if (strokePaintingResource->applyResource(object, object->style(), context, ApplyToStrokeMode))
+    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();
+            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);
     }

trunk/WebCore/rendering/RenderSVGResourceContainer.h

@@ -24 +24 @@
 #if ENABLE(SVG)
 #include "RenderSVGHiddenContainer.h"
+
+#include "SVGStyledTransformableElement.h"
 #include "RenderSVGResource.h"
 
@@ -81 +83 @@
 
     virtual RenderSVGResourceContainer* toRenderSVGResourceContainer() { return this; }
+    
+    static AffineTransform transformOnNonScalingStroke(RenderObject* object, const AffineTransform resourceTransform)
+    {
+        if (!object->isRenderPath())
+            return resourceTransform;
+
+        SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(object->node());
+        AffineTransform transform = resourceTransform;
+        transform.multiply(element->getScreenCTM());
+        return transform;
+    }
 
 private:

trunk/WebCore/rendering/RenderSVGResourceGradient.cpp

@@ -208 +208 @@
         context->setFillRule(svgStyle->fillRule());
     } else if (resourceMode & ApplyToStrokeMode) {
+        if (svgStyle->vectorEffect() == VE_NON_SCALING_STROKE)
+            gradientData->gradient->setGradientSpaceTransform(transformOnNonScalingStroke(object, gradientData->userspaceTransform));
         context->setAlpha(svgStyle->strokeOpacity());
         context->setStrokeGradient(gradientData->gradient);

trunk/WebCore/rendering/RenderSVGResourcePattern.cpp

@@ -117 +117 @@
         context->setFillRule(svgStyle->fillRule());
     } else if (resourceMode & ApplyToStrokeMode) {
+        if (svgStyle->vectorEffect() == VE_NON_SCALING_STROKE)
+            patternData->pattern->setPatternSpaceTransform(transformOnNonScalingStroke(object, patternData->transform));
         context->setAlpha(svgStyle->strokeOpacity());
         context->setStrokePattern(patternData->pattern);

trunk/WebCore/rendering/style/SVGRenderStyle.h

@@ -59 +59 @@
     SVG_RS_DEFINE_ATTRIBUTE(EDominantBaseline, DominantBaseline, dominantBaseline, DB_AUTO)
     SVG_RS_DEFINE_ATTRIBUTE(EBaselineShift, BaselineShift, baselineShift, BS_BASELINE)
+    SVG_RS_DEFINE_ATTRIBUTE(EVectorEffect, VectorEffect, vectorEffect, VE_NONE)
 
     SVG_RS_DEFINE_ATTRIBUTE_INHERITED(LineCap, CapStyle, capStyle, ButtCap)
@@ -169 +170 @@
                 unsigned _dominantBaseline : 4; // EDominantBaseline
                 unsigned _baselineShift : 2; // EBaselineShift
-                // 22 bits unused
+                unsigned _vectorEffect: 1; // EVectorEffect
+                // 21 bits unused
             } f;
             uint32_t _niflags;
@@ -214 +216 @@
         svg_noninherited_flags.f._dominantBaseline = initialDominantBaseline();
         svg_noninherited_flags.f._baselineShift = initialBaselineShift();
+        svg_noninherited_flags.f._vectorEffect = initialVectorEffect();
     }
 };

trunk/WebCore/rendering/style/SVGRenderStyleDefs.h

@@ -122 +122 @@
         DB_CENTRAL, DB_MIDDLE, DB_TEXT_AFTER_EDGE, DB_TEXT_BEFORE_EDGE
     };
+    
+    enum EVectorEffect {
+        VE_NONE,
+        VE_NON_SCALING_STROKE
+    };
 
     class CSSValue;

trunk/WebCore/svg/SVGLocatable.cpp

@@ -92 +92 @@
 
     SVGElement* stopAtElement = mode == NearestViewportScope ? nearestViewportElement(element) : 0;
-    for (const Node* current = element; current && current->isSVGElement(); current = current->parentNode()) {
-        const SVGElement* currentElement = static_cast<const SVGElement*>(current);
+
+    Node* current = const_cast<SVGElement*>(element);
+    while (current && current->isSVGElement()) {
+        SVGElement* currentElement = static_cast<SVGElement*>(current);
         if (currentElement->isStyled())
-            ctm = static_cast<const SVGStyledElement*>(currentElement)->localCoordinateSpaceTransform(mode).multLeft(ctm);
+            ctm = static_cast<SVGStyledElement*>(currentElement)->localCoordinateSpaceTransform(mode).multLeft(ctm);
 
         // For getCTM() computation, stop at the nearest viewport element
         if (currentElement == stopAtElement)
             break;
+
+        current = current->isShadowNode() ? current->shadowParentNode() : current->parentNode();
     }
 

trunk/WebCore/svg/SVGStyledElement.cpp

@@ -186 +186 @@
         mapAttributeToCSSProperty(propertyNameToIdMap, text_renderingAttr);
         mapAttributeToCSSProperty(propertyNameToIdMap, unicode_bidiAttr);
+        mapAttributeToCSSProperty(propertyNameToIdMap, vector_effectAttr);
         mapAttributeToCSSProperty(propertyNameToIdMap, visibilityAttr);
         mapAttributeToCSSProperty(propertyNameToIdMap, word_spacingAttr);

trunk/WebCore/svg/svgattrs.in

@@ -229 +229 @@
 v-mathematical
 values
+vector-effect
 version
 vert-adv-y