Don't conflate intrinsic width and height with logical width and height

Source/core/layout/svg/LayoutSVGRoot.cpp

Index: Source/core/layout/svg/LayoutSVGRoot.cpp
diff --git a/Source/core/layout/svg/LayoutSVGRoot.cpp b/Source/core/layout/svg/LayoutSVGRoot.cpp
index af3cd61721a2fe3bb6672dbed8ef9dc3b353c79c..e2f0277b019095c13e0cd549e3b3cb3869c2ed96 100644
--- a/Source/core/layout/svg/LayoutSVGRoot.cpp
+++ b/Source/core/layout/svg/LayoutSVGRoot.cpp
@@ -115,16 +115,8 @@ bool LayoutSVGRoot::isEmbeddedThroughFrameContainingSVGDocument() const
     return frame->document()->isSVGDocument();
 }
 
-static inline LayoutUnit resolveLengthAttributeForSVG(const Length& length, float scale, float maxSize)
-{
-    return static_cast<LayoutUnit>(valueForLength(length, maxSize) * (length.isFixed() ? scale : 1));
-}
-
 LayoutUnit LayoutSVGRoot::computeReplacedLogicalWidth(ShouldComputePreferred shouldComputePreferred) const
 {
-    SVGSVGElement* svg = toSVGSVGElement(node());
-    ASSERT(svg);
-
     // When we're embedded through SVGImage (border-image/background-image/<html:img>/...) we're forced to resize to a specific size.
     if (!m_containerSize.isEmpty())
         return m_containerSize.width();
@@ -135,18 +127,12 @@ LayoutUnit LayoutSVGRoot::computeReplacedLogicalWidth(ShouldComputePreferred sho
     if (style()->logicalWidth().isSpecified() || style()->logicalMaxWidth().isSpecified())

[fs, 2015/05/07 11:02:36]

Looks like this will be made redundant (too)

         return LayoutReplaced::computeReplacedLogicalWidth(shouldComputePreferred);
 
-    if (svg->hasIntrinsicWidth())
-        return resolveLengthAttributeForSVG(svg->intrinsicWidth(), style()->effectiveZoom(), containingBlock()->availableLogicalWidth().toFloat());
-
     // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.
     return LayoutReplaced::computeReplacedLogicalWidth(shouldComputePreferred);
 }
 
 LayoutUnit LayoutSVGRoot::computeReplacedLogicalHeight() const
 {
-    SVGSVGElement* svg = toSVGSVGElement(node());
-    ASSERT(svg);
-
     // When we're embedded through SVGImage (border-image/background-image/<html:img>/...) we're forced to resize to a specific size.
     if (!m_containerSize.isEmpty())
         return m_containerSize.height();
@@ -157,9 +143,6 @@ LayoutUnit LayoutSVGRoot::computeReplacedLogicalHeight() const
     if (style()->logicalHeight().isSpecified() || style()->logicalMaxHeight().isSpecified())

[fs, 2015/05/07 11:02:36]

Ditto.

         return LayoutReplaced::computeReplacedLogicalHeight();
 
-    if (svg->hasIntrinsicHeight())
-        return resolveLengthAttributeForSVG(svg->intrinsicHeight(), style()->effectiveZoom(), containingBlock()->availableLogicalHeight(IncludeMarginBorderPadding).toFloat());
-
     // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.
     return LayoutReplaced::computeReplacedLogicalHeight();
 }