Map width/height to style for foreignObject

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 64 matching lines @@
     else if (name == SVGNames::widthAttr)
         m_width->setBaseValueAsString(value, parseError);
     else if (name == SVGNames::heightAttr)
         m_height->setBaseValueAsString(value, parseError);
     else
         ASSERT_NOT_REACHED();
 
     reportAttributeParsingError(parseError, name, value);
 }
 
+bool SVGForeignObjectElement::isPresentationAttribute(const QualifiedName& name) const
+{
+    if (name == SVGNames::widthAttr || name == SVGNames::heightAttr)
+        return true;
+    return SVGGraphicsElement::isPresentationAttribute(name);
+}
+
+void SVGForeignObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
+{
+    if (name == SVGNames::widthAttr || name == SVGNames::heightAttr) {

[fs, 2014/04/02 11:00:41]

It seems unnecessary to check these twice (for no apparent reason)?

[davve, 2014/04/02 11:17:48]

Thanks. Was remains from earlier versions.

+        if (name == SVGNames::widthAttr)
+            addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, m_width->currentValue()->valueAsString());

[fs, 2014/04/02 11:00:41]

Why not just pass |value| as the value? (IIUC, if there's animations, they would
use the override style.)

[davve, 2014/04/02 11:17:48]

I specifically added a test that fails when using |value|. Svg dom won't
override in current state. Something like setting width.baseVal.value will not
touch the underlying attribute.

[fs, 2014/04/02 11:55:00]

Ok. I figured that's what the change in svgAttributeChanged() was for. Some
synchronization missing in the pres-attr code-path then maybe...

[davve, 2014/04/02 12:43:56]

It is. But it only triggers the recomputation, doesn't affect the outcome.
I'll look into it.

+        else if (name == SVGNames::heightAttr)
+            addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, m_height->currentValue()->valueAsString());
+    } 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);
+    }
+
     SVGElementInstance::InvalidationGuard invalidationGuard(this);
 
     bool isLengthAttribute = attrName == SVGNames::xAttr
                           || attrName == SVGNames::yAttr
                           || attrName == SVGNames::widthAttr
                           || attrName == SVGNames::heightAttr;
 
     if (isLengthAttribute)
         updateRelativeLengthsInformation();
 
@@ skipping 26 matching lines @@
 
 bool SVGForeignObjectElement::selfHasRelativeLengths() const
 {
     return m_x->currentValue()->isRelative()
         || m_y->currentValue()->isRelative()
         || m_width->currentValue()->isRelative()
         || m_height->currentValue()->isRelative();
 }
 
 }