[svg2] Make 'x' and 'y' presentation attributes

Source/core/svg/SVGForeignObjectElement.cpp

 /*
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@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,
@@ skipping 56 matching lines @@
     return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
 }
 
 void SVGForeignObjectElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     parseAttributeNew(name, value);
 }
 
 bool SVGForeignObjectElement::isPresentationAttribute(const QualifiedName& name) const
 {
-    if (name == SVGNames::widthAttr || name == SVGNames::heightAttr)
+    if (name == SVGNames::xAttr || name == SVGNames::yAttr
+        || name == SVGNames::widthAttr || name == SVGNames::heightAttr)
         return true;
     return SVGGraphicsElement::isPresentationAttribute(name);
 }
 
+bool SVGForeignObjectElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attrName) const
+{
+    if (attrName == SVGNames::xAttr || attrName== SVGNames::yAttr
+        || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr)
+        return true;
+    return SVGGraphicsElement::isPresentationAttributeWithSVGDOM(attrName);
+}
+
 void SVGForeignObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
 {
-    if (name == SVGNames::widthAttr || name == SVGNames::heightAttr) {
+    RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute(name);
+    if (property == m_width || property == m_height) {
         RefPtrWillBeRawPtr<SVGLength> length = SVGLength::create(LengthModeOther);
         TrackExceptionState exceptionState;
         length->setValueAsString(value, exceptionState);
         if (!exceptionState.hadException()) {
-            if (name == SVGNames::widthAttr)
+            if (property == m_width)
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, value);
-            else if (name == SVGNames::heightAttr)
+            else if (property == m_height)
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, value);
         }
+    } else if (property == m_x) {
+        addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyX, *m_x->currentValue());
+    } else if (property == m_y) {
+        addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyY, *m_y->currentValue());
     } else {
         SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);
     }
 }
 
 void SVGForeignObjectElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGGraphicsElement::svgAttributeChanged(attrName);
         return;
     }
 
-    if (attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr) {
-        invalidateSVGPresentationAttributeStyle();
-        setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::SVGContainerSizeChange));
-    }
-
     SVGElement::InvalidationGuard invalidationGuard(this);
 
-    bool isLengthAttribute = attrName == SVGNames::xAttr
-                          || attrName == SVGNames::yAttr
-                          || attrName == SVGNames::widthAttr
-                          || attrName == SVGNames::heightAttr;
+    bool isWidthHeightAttribute = attrName == SVGNames::widthAttr
+        || attrName == SVGNames::heightAttr;
+    bool isXYAttribute = attrName == SVGNames::xAttr || attrName == SVGNames::yAttr;
 
-    if (isLengthAttribute) {
+    if (isXYAttribute || isWidthHeightAttribute) {
+        invalidateSVGPresentationAttributeStyle();
+        setNeedsStyleRecalc(LocalStyleChange,
+            isWidthHeightAttribute ? StyleChangeReasonForTracing::create(StyleChangeReason::SVGContainerSizeChange) : StyleChangeReasonForTracing::fromAttribute(attrName));
+
         updateRelativeLengthsInformation();
         if (LayoutObject* renderer = this->renderer())
             markForLayoutAndParentResourceInvalidation(renderer);
     }
 }
 
 LayoutObject* SVGForeignObjectElement::createRenderer(const LayoutStyle&)
 {
     return new LayoutSVGForeignObject(this);
 }
@@ skipping 18 matching lines @@
 
 bool SVGForeignObjectElement::selfHasRelativeLengths() const
 {
     return m_x->currentValue()->isRelative()
         || m_y->currentValue()->isRelative()
         || m_width->currentValue()->isRelative()
         || m_height->currentValue()->isRelative();
 }
 
 } // namespace blink