Revert 91125 - 2011-07-15 Rob Buis <rbuis@rim.com>

Source/WebCore/rendering/svg/RenderSVGPath.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2005, 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 82 matching lines @@
 
 bool RenderSVGPath::strokeContains(const FloatPoint& point, bool requiresStroke)
 {
     if (!m_strokeAndMarkerBoundingBox.contains(point))
         return false;
 
     Color fallbackColor;
     if (requiresStroke && !RenderSVGResource::strokePaintingResource(this, style(), fallbackColor))
         return false;
 
-    if (shouldStrokeZeroLengthSubpath())
-        return zeroLengthSubpathRect().contains(point);
-
     BoundingRectStrokeStyleApplier strokeStyle(this, style());
     return m_path.strokeContains(&strokeStyle, point);
 }
 
 void RenderSVGPath::layout()
 {
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout() && selfNeedsLayout());
     SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(node());
 
     bool updateCachedBoundariesInParents = false;
@@ skipping 29 matching lines @@
     }
 
     // If our bounds changed, notify the parents.
     if (updateCachedBoundariesInParents)
         RenderSVGModelObject::setNeedsBoundariesUpdate();
 
     repainter.repaintAfterLayout();
     setNeedsLayout(false);
 }
 
-bool RenderSVGPath::shouldStrokeZeroLengthSubpath() const
-{
-    // Spec(11.4): Any zero length subpath shall not be stroked if the ‘stroke-linecap’ property has a value of butt
-    // but shall be stroked if the ‘stroke-linecap’ property has a value of round or square
-    return style()->svgStyle()->hasStroke() && style()->svgStyle()->capStyle() != ButtCap && !m_fillBoundingBox.width() && !m_fillBoundingBox.height();
-}
-
-FloatRect RenderSVGPath::zeroLengthSubpathRect() const
-{
-    SVGElement* svgElement = static_cast<SVGElement*>(node());
-    float strokeWidth = style()->svgStyle()->strokeWidth().value(svgElement);
-    return FloatRect(m_fillBoundingBox.x() - strokeWidth / 2, m_fillBoundingBox.y() - strokeWidth / 2, strokeWidth, strokeWidth);
-}
-
-void RenderSVGPath::setupSquareCapPath(Path*& usePath, int& applyMode)
-{
-    // Spec(11.4): Any zero length subpath shall not be stroked if the ‘stroke-linecap’ property has a value of butt
-    // but shall be stroked if the ‘stroke-linecap’ property has a value of round or square
-    DEFINE_STATIC_LOCAL(Path, tempPath, ());
-
-    applyMode = ApplyToFillMode;
-    usePath = &tempPath;
-    usePath->clear();
-    if (style()->svgStyle()->capStyle() == SquareCap)
-        usePath->addRect(zeroLengthSubpathRect());
-    else
-        usePath->addEllipse(zeroLengthSubpathRect());
-}
-
-bool RenderSVGPath::setupNonScalingStrokePath(Path*& usePath, GraphicsContextStateSaver& stateSaver)
-{
-    DEFINE_STATIC_LOCAL(Path, tempPath, ());
-
-    SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(node());
-    AffineTransform nonScalingStrokeTransform = element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
-    if (!nonScalingStrokeTransform.isInvertible())
-        return false;
-
-    tempPath = m_path;
-    usePath = &tempPath;
-    tempPath.transform(nonScalingStrokeTransform);
-
-    stateSaver.save();
-    stateSaver.context()->concatCTM(nonScalingStrokeTransform.inverse());
-    return true;
-}
-
 void RenderSVGPath::fillAndStrokePath(GraphicsContext* context)
 {
     RenderStyle* style = this->style();
 
     Color fallbackColor;
     if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(this, style, fallbackColor)) {
         if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode))
             fillPaintingResource->postApplyResource(this, context, ApplyToFillMode, &m_path);
         else if (fallbackColor.isValid()) {
             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
             fallbackResource->setColor(fallbackColor);
             if (fallbackResource->applyResource(this, style, context, ApplyToFillMode))
                 fallbackResource->postApplyResource(this, context, ApplyToFillMode, &m_path);
         }
     }
 
     fallbackColor = Color();
     RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(this, style, fallbackColor);
     if (!strokePaintingResource)
         return;
 
-    Path* usePath = &m_path;
-    int applyMode = ApplyToStrokeMode;
+    Path path;
 
     bool nonScalingStroke = style->svgStyle()->vectorEffect() == VE_NON_SCALING_STROKE;
 
     GraphicsContextStateSaver stateSaver(*context, false);
+    if (nonScalingStroke) {
+        SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(node());
+        AffineTransform nonScalingStrokeTransform = element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
+        if (!nonScalingStrokeTransform.isInvertible())
+            return;
 
-    // Spec(11.4): Any zero length subpath shall not be stroked if the ‘stroke-linecap’ property has a value of butt
-    // but shall be stroked if the ‘stroke-linecap’ property has a value of round or square
-    // FIXME: this does not work for zero-length subpaths, only when total path is zero-length
-    if (shouldStrokeZeroLengthSubpath())
-        setupSquareCapPath(usePath, applyMode);
-    else if (nonScalingStroke) {
-       if (!setupNonScalingStrokePath(usePath, stateSaver))
-           return;
+        path = m_path;
+        path.transform(nonScalingStrokeTransform);
+
+        stateSaver.save();
+        context->concatCTM(nonScalingStrokeTransform.inverse());
     }
 
-    if (strokePaintingResource->applyResource(this, style, context, applyMode))
-        strokePaintingResource->postApplyResource(this, context, applyMode, usePath);
+    if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode))
+        strokePaintingResource->postApplyResource(this, context, ApplyToStrokeMode, nonScalingStroke ? &path : &m_path);
     else if (fallbackColor.isValid()) {
         RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
         fallbackResource->setColor(fallbackColor);
-        if (fallbackResource->applyResource(this, style, context, applyMode))
-            fallbackResource->postApplyResource(this, context, applyMode, usePath);
+        if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode))
+            fallbackResource->postApplyResource(this, context, ApplyToStrokeMode, nonScalingStroke ? &path : &m_path);
     }
 }
 
 void RenderSVGPath::paint(PaintInfo& paintInfo, const LayoutPoint&)
 {
     if (paintInfo.context->paintingDisabled() || style()->visibility() == HIDDEN || m_path.isEmpty())
         return;
 
     FloatRect boundingBox = repaintRectInLocalCoordinates();
     if (!SVGRenderSupport::paintInfoIntersectsRepaintRect(boundingBox, m_localTransform, paintInfo))
@@ skipping 95 matching lines @@
     if (m_path.isEmpty()) {
         m_fillBoundingBox = FloatRect();
         m_strokeAndMarkerBoundingBox = FloatRect();
         m_repaintBoundingBox = FloatRect();
         return;
     }
 
     // Cache _unclipped_ fill bounding box, used for calculations in resources
     m_fillBoundingBox = m_path.boundingRect();
 
-    // Spec(11.4): Any zero length subpath shall not be stroked if the ‘stroke-linecap’ property has a value of butt
-    // but shall be stroked if the ‘stroke-linecap’ property has a value of round or square
-    if (shouldStrokeZeroLengthSubpath()) {
-        m_strokeAndMarkerBoundingBox = zeroLengthSubpathRect();
-        // Cache smallest possible repaint rectangle
-        m_repaintBoundingBox = m_strokeAndMarkerBoundingBox;
-        SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingBox);
-        return;
-    }
-
     // Cache _unclipped_ stroke bounding box, used for calculations in resources (includes marker boundaries)
     m_strokeAndMarkerBoundingBox = m_fillBoundingBox;
 
     const SVGRenderStyle* svgStyle = style()->svgStyle();
     if (svgStyle->hasStroke()) {
         BoundingRectStrokeStyleApplier strokeStyle(this, style());
         m_strokeAndMarkerBoundingBox.unite(m_path.strokeBoundingRect(&strokeStyle));
     }
 
     if (svgStyle->hasMarkers()) {
         FloatRect markerBounds = calculateMarkerBoundsIfNeeded();
         if (!markerBounds.isEmpty())
             m_strokeAndMarkerBoundingBox.unite(markerBounds);
     }
 
     // Cache smallest possible repaint rectangle
     m_repaintBoundingBox = m_strokeAndMarkerBoundingBox;
     SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingBox);
 }
 
 }
 
 #endif // ENABLE(SVG)