Return computed style for width/height for non-root SVG

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2019 matching lines @@
 
 std::unique_ptr<HashMap<AtomicString, RefPtr<CSSVariableData>>>
 ComputedStyleCSSValueMapping::getVariables(const ComputedStyle& style) {
   // TODO(timloh): Also return non-inherited variables
   StyleInheritedVariables* variables = style.inheritedVariables();
   if (variables)
     return variables->getVariables();
   return nullptr;
 }
 
+static bool widthOrHeightPropertyAppliesToObject(const LayoutObject& object) {
+  // According to
+  // http://www.w3.org/TR/CSS2/visudet.html#the-width-property and
+  // http://www.w3.org/TR/CSS2/visudet.html#the-height-property, the "width" or
+  // "height" property does not apply to non-atomic inline elements.
+  if (!object.isAtomicInlineLevel() && object.isInline())
+    return false;
+
+  // Non-root SVG should be treated as non-atomic inline no matter how we
+  // implement it internally (e.g. LayoutSVGBlock is based on LayoutBlockFlow).
+  return !object.isSVGChild();
+}
+
 const CSSValue* ComputedStyleCSSValueMapping::get(
     CSSPropertyID propertyID,
     const ComputedStyle& style,
     const LayoutObject* layoutObject,
     Node* styledNode,
     bool allowVisitedStyle) {
   const SVGComputedStyle& svgStyle = style.svgStyle();
   propertyID = CSSProperty::resolveDirectionAwareProperty(
       propertyID, style.direction(), style.getWritingMode());
   switch (propertyID) {
@@ skipping 475 matching lines @@
     case CSSPropertyGridColumnGap:
       return zoomAdjustedPixelValueForLength(style.gridColumnGap(), style);
     case CSSPropertyGridRowGap:
       return zoomAdjustedPixelValueForLength(style.gridRowGap(), style);
     case CSSPropertyGridGap:
       return valuesForShorthandProperty(gridGapShorthand(), style, layoutObject,
                                         styledNode, allowVisitedStyle);
 
     case CSSPropertyHeight:
       if (layoutObject) {
-        // According to
-        // http://www.w3.org/TR/CSS2/visudet.html#the-height-property, the
-        // "height" property does not apply for non-atomic inline elements.
-        if (!layoutObject->isAtomicInlineLevel() && layoutObject->isInline())
+        if (!widthOrHeightPropertyAppliesToObject(*layoutObject))
           return CSSIdentifierValue::create(CSSValueAuto);
         return zoomAdjustedPixelValue(sizingBox(layoutObject).height(), style);
       }
       return zoomAdjustedPixelValueForLength(style.height(), style);
     case CSSPropertyWebkitHighlight:
       if (style.highlight() == nullAtom)
         return CSSIdentifierValue::create(CSSValueNone);
       return CSSStringValue::create(style.highlight());
     case CSSPropertyHyphens:
       return CSSIdentifierValue::create(style.getHyphens());
@@ skipping 337 matching lines @@
       return nullptr;
     case CSSPropertyVisibility:
       return CSSIdentifierValue::create(style.visibility());
     case CSSPropertyWhiteSpace:
       return CSSIdentifierValue::create(style.whiteSpace());
     case CSSPropertyWidows:
       return CSSPrimitiveValue::create(style.widows(),
                                        CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyWidth:
       if (layoutObject) {
-        // According to
-        // http://www.w3.org/TR/CSS2/visudet.html#the-width-property,
-        // the "width" property does not apply for non-atomic inline elements.
-        if (!layoutObject->isAtomicInlineLevel() && layoutObject->isInline())
+        if (!widthOrHeightPropertyAppliesToObject(*layoutObject))
           return CSSIdentifierValue::create(CSSValueAuto);
         return zoomAdjustedPixelValue(sizingBox(layoutObject).width(), style);
       }
       return zoomAdjustedPixelValueForLength(style.width(), style);
     case CSSPropertyWillChange:
       return valueForWillChange(style.willChangeProperties(),
                                 style.willChangeContents(),
                                 style.willChangeScrollPosition());
     case CSSPropertyWordBreak:
       return CSSIdentifierValue::create(style.wordBreak());
@@ skipping 791 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace blink