SVG: Promote d to a property

third_party/WebKit/Source/core/svg/SVGPathElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/svg/SVGPathElement.h"
 
 #include "core/layout/svg/LayoutSVGPath.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGMPathElement.h"
 #include "core/svg/SVGPathQuery.h"
+#include "core/svg/SVGPathUtilities.h"
 #include "core/svg/SVGPointTearOff.h"
 
 namespace blink {
 
 class SVGAnimatedPathLength final : public SVGAnimatedNumber {
 public:
     static PassRefPtrWillBeRawPtr<SVGAnimatedPathLength> create(SVGPathElement* contextElement)
     {
         return adoptRefWillBeNoop(new SVGAnimatedPathLength(contextElement));
     }
@@ skipping 27 matching lines @@
 {
     visitor->trace(m_pathLength);
     visitor->trace(m_path);
     SVGGeometryElement::trace(visitor);
 }
 
 DEFINE_NODE_FACTORY(SVGPathElement)
 
 Path SVGPathElement::asPath() const
 {
-    // If this is a <use> instance, return the referenced path to maximize geometry sharing.
-    if (const SVGElement* element = correspondingElement())
-        return toSVGPathElement(element)->asPath();
+    if (layoutObject()) {
+        const SVGComputedStyle& svgStyle = layoutObject()->styleRef().svgStyle();
+        return svgStyle.d()->path();
 

[fs, 2015/12/14 11:51:40]

Nit: Remove blank line.

[Eric Willigers, 2015/12/14 22:18:23]

Done.

-    return m_path->currentValue()->path();
+    }
+
+    return m_path->currentValue()->pathValue()->path();
+}
+
+const SVGPathByteStream& SVGPathElement::pathByteStream() const
+{
+    if (layoutObject()) {
+        const SVGComputedStyle& svgStyle = layoutObject()->styleRef().svgStyle();
+        return svgStyle.d()->byteStream();
+

[fs, 2015/12/14 11:51:40]

Ditto.

[Eric Willigers, 2015/12/14 22:18:23]

Done.

+    }
+
+    return m_path->currentValue()->byteStream();
 }
 
 float SVGPathElement::getTotalLength()
 {
-    return SVGPathQuery(m_path->currentValue()->byteStream()).getTotalLength();
+    document().updateLayoutIgnorePendingStylesheets();
+    return SVGPathQuery(pathByteStream()).getTotalLength();
 }
 
 PassRefPtrWillBeRawPtr<SVGPointTearOff> SVGPathElement::getPointAtLength(float length)
 {
-    FloatPoint point = SVGPathQuery(m_path->currentValue()->byteStream()).getPointAtLength(length);
+    document().updateLayoutIgnorePendingStylesheets();
+    FloatPoint point = SVGPathQuery(pathByteStream()).getPointAtLength(length);
     return SVGPointTearOff::create(SVGPoint::create(point), 0, PropertyIsNotAnimVal);
 }
 
 unsigned SVGPathElement::getPathSegAtLength(float length)
 {
-    return SVGPathQuery(m_path->currentValue()->byteStream()).getPathSegIndexAtLength(length);
+    document().updateLayoutIgnorePendingStylesheets();
+    return SVGPathQuery(pathByteStream()).getPathSegIndexAtLength(length);
+}
+
+bool SVGPathElement::isPresentationAttribute(const QualifiedName& attrName) const
+{
+    if (attrName == SVGNames::dAttr)
+        return true;
+    return SVGGeometryElement::isPresentationAttribute(attrName);
+}
+
+bool SVGPathElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attrName) const
+{
+    if (attrName == SVGNames::dAttr)
+        return true;
+    return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
 }
 
 void SVGPathElement::svgAttributeChanged(const QualifiedName& attrName)
 {
-    if (attrName == SVGNames::dAttr || attrName == SVGNames::pathLengthAttr) {
+    if (attrName == SVGNames::dAttr) {
         SVGElement::InvalidationGuard invalidationGuard(this);
+        invalidateSVGPresentationAttributeStyle();
+        setNeedsStyleRecalc(LocalStyleChange,
+            StyleChangeReasonForTracing::fromAttribute(attrName));
 
-        LayoutSVGShape* layoutObject = toLayoutSVGShape(this->layoutObject());
+        if (LayoutSVGShape* layoutPath = toLayoutSVGShape(this->layoutObject()))
+            layoutPath->setNeedsShapeUpdate();
 
-        if (attrName == SVGNames::dAttr) {
-            if (layoutObject)
-                layoutObject->setNeedsShapeUpdate();
+        invalidateMPathDependencies();
+        if (layoutObject())
+            markForLayoutAndParentResourceInvalidation(layoutObject());
 
-            invalidateMPathDependencies();
-        }
+        return;
+    }
 
-        if (layoutObject)
-            markForLayoutAndParentResourceInvalidation(layoutObject);
-
+    if (attrName == SVGNames::pathLengthAttr) {
+        SVGElement::InvalidationGuard invalidationGuard(this);
+        if (layoutObject())
+            markForLayoutAndParentResourceInvalidation(layoutObject());
         return;
     }
 
     SVGGeometryElement::svgAttributeChanged(attrName);
 }
 
+void SVGPathElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
+{
+    RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute(name);
+    if (property == m_path)
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyD, m_path->currentValue()->pathValue());
+    else
+        SVGGeometryElement::collectStyleForPresentationAttribute(name, value, style);
+}
+
 void SVGPathElement::invalidateMPathDependencies()
 {
     // <mpath> can only reference <path> but this dependency is not handled in
     // markForLayoutAndParentResourceInvalidation so we update any mpath dependencies manually.
     if (SVGElementSet* dependencies = setOfIncomingReferences()) {
         for (SVGElement* element : *dependencies) {
             if (isSVGMPathElement(*element))
                 toSVGMPathElement(element)->targetPathChanged();
         }
     }
 }
 
 Node::InsertionNotificationRequest SVGPathElement::insertedInto(ContainerNode* rootParent)
 {
     SVGGeometryElement::insertedInto(rootParent);
     invalidateMPathDependencies();
     return InsertionDone;
 }
 
 void SVGPathElement::removedFrom(ContainerNode* rootParent, Node* next)
 {
     SVGGeometryElement::removedFrom(rootParent, next);
     invalidateMPathDependencies();
 }
 
 } // namespace blink