Store CSSPropertyID in SVGAnimatedPropertyBase

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

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Google, Inc.
  *
  * 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.
@@ skipping 49 matching lines @@
 #include "wtf/MathExtras.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 inline SVGSVGElement::SVGSVGElement(Document& doc)
     : SVGGraphicsElement(SVGNames::svgTag, doc),
       SVGFitToViewBox(this),
       m_x(SVGAnimatedLength::create(this,
                                     SVGNames::xAttr,
-                                    SVGLength::create(SVGLengthMode::Width))),
+                                    SVGLength::create(SVGLengthMode::Width),
+                                    CSSPropertyX)),
       m_y(SVGAnimatedLength::create(this,
                                     SVGNames::yAttr,
-                                    SVGLength::create(SVGLengthMode::Height))),
-      m_width(
-          SVGAnimatedLength::create(this,
-                                    SVGNames::widthAttr,
-                                    SVGLength::create(SVGLengthMode::Width))),
+                                    SVGLength::create(SVGLengthMode::Height),
+                                    CSSPropertyY)),
+      m_width(SVGAnimatedLength::create(this,
+                                        SVGNames::widthAttr,
+                                        SVGLength::create(SVGLengthMode::Width),
+                                        CSSPropertyWidth)),
       m_height(
           SVGAnimatedLength::create(this,
                                     SVGNames::heightAttr,
-                                    SVGLength::create(SVGLengthMode::Height))),
+                                    SVGLength::create(SVGLengthMode::Height),
+                                    CSSPropertyHeight)),
       m_useCurrentView(false),
       m_timeContainer(SMILTimeContainer::create(*this)),
       m_translation(SVGPoint::create()),
       m_currentScale(1) {
   m_width->setDefaultValueAsString("100%");
   m_height->setDefaultValueAsString("100%");
 
   addToPropertyMap(m_x);
   addToPropertyMap(m_y);
   addToPropertyMap(m_width);
@@ skipping 118 matching lines @@
       parseError = property->setBaseValueAsString(value);
     if (parseError != SVGParseStatus::NoError || value.isNull())
       property->setDefaultValueAsString("100%");
     reportAttributeParsingError(parseError, name, value);
   } else {
     SVGElement::parseAttribute(name, oldValue, value);
   }
 }
 
 bool SVGSVGElement::isPresentationAttribute(const QualifiedName& name) const {
-  if (isOutermostSVGSVGElement() &&
-      (name == SVGNames::widthAttr || name == SVGNames::heightAttr))
-    return true;
-  else if (name == SVGNames::xAttr || name == SVGNames::yAttr)
-    return true;
-
+  if ((name == SVGNames::widthAttr || name == SVGNames::heightAttr) &&
+      !isOutermostSVGSVGElement())
+    return false;
   return SVGGraphicsElement::isPresentationAttribute(name);
 }
 
 bool SVGSVGElement::isPresentationAttributeWithSVGDOM(
     const QualifiedName& attrName) const {
-  if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr)
-    return true;
+  if (attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr)
+    return false;
   return SVGGraphicsElement::isPresentationAttributeWithSVGDOM(attrName);
 }
 
 void SVGSVGElement::collectStyleForPresentationAttribute(
     const QualifiedName& name,
     const AtomicString& value,
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_x) {
     addPropertyToPresentationAttributeStyle(
@@ skipping 549 matching lines @@
   visitor->trace(m_width);
   visitor->trace(m_height);
   visitor->trace(m_translation);
   visitor->trace(m_timeContainer);
   visitor->trace(m_viewSpec);
   SVGGraphicsElement::trace(visitor);
   SVGFitToViewBox::trace(visitor);
 }
 
 }  // namespace blink