Expand IntrinsicSizingInfo for SVG

third_party/WebKit/Source/core/layout/LayoutReplaced.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
  * 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 14 matching lines @@
 
 #include "core/editing/PositionWithAffinity.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/ReplacedPainter.h"
-#include "core/svg/SVGSVGElement.h"
 #include "platform/LengthFunctions.h"
 
 namespace blink {
 
 const int LayoutReplaced::defaultWidth = 300;
 const int LayoutReplaced::defaultHeight = 150;
 
 LayoutReplaced::LayoutReplaced(Element* element)
     : LayoutBox(element)
     , m_intrinsicSize(defaultWidth, defaultHeight)
@@ skipping 490 matching lines @@
     ASSERT(!embeddedContentBox());
     intrinsicSizingInfo.size = FloatSize(intrinsicLogicalWidth().toFloat(), intrinsicLogicalHeight().toFloat());
 
     // Figure out if we need to compute an intrinsic ratio.
     if (intrinsicSizingInfo.size.isEmpty() || !layoutObjectHasAspectRatio(this))
         return;
 
     intrinsicSizingInfo.aspectRatio = intrinsicSizingInfo.size.width() / intrinsicSizingInfo.size.height();
 }
 
-static bool hasIntrinsicWidthForLayoutBox(LayoutBox* layoutObject)
-{
-    if (layoutObject && layoutObject->isSVGRoot()) {
-        SVGSVGElement* svg = toSVGSVGElement(layoutObject->node());
-        ASSERT(svg);
-        return svg->hasIntrinsicWidth();
-    }
-
-    return false;
-}
-
-static bool hasIntrinsicHeightForLayoutBox(LayoutBox* layoutObject)
-{
-    if (layoutObject && layoutObject->isSVGRoot()) {
-        SVGSVGElement* svg = toSVGSVGElement(layoutObject->node());
-        ASSERT(svg);
-        return svg->hasIntrinsicHeight();
-    }
-
-    return false;
-}
-
 LayoutUnit LayoutReplaced::computeReplacedLogicalWidth(ShouldComputePreferred shouldComputePreferred) const
 {
     if (style()->logicalWidth().isSpecified() || style()->logicalWidth().isIntrinsic())
         return computeReplacedLogicalWidthRespectingMinMaxWidth(computeReplacedLogicalWidthUsing(MainOrPreferredSize, style()->logicalWidth()), shouldComputePreferred);
 
     LayoutBox* contentLayoutObject = embeddedContentBox();
 
     // 10.3.2 Inline, replaced elements: http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width
     IntrinsicSizingInfo intrinsicSizingInfo;
     computeIntrinsicSizingInfoForLayoutBox(contentLayoutObject, intrinsicSizingInfo);
     FloatSize constrainedSize = constrainIntrinsicSizeToMinMax(intrinsicSizingInfo);
 
     if (style()->logicalWidth().isAuto()) {
         bool computedHeightIsAuto = hasAutoHeightOrContainingBlockWithAutoHeight();
-        // TODO(shanmuga.m@samsung.com): hasIntrinsicWidth/Height information should be obtained
-        // from LayoutBox::computeIntrinsicSizingInfo().
-        bool hasIntrinsicWidth = constrainedSize.width() > 0 || hasIntrinsicWidthForLayoutBox(contentLayoutObject);
+        bool hasIntrinsicWidth = !intrinsicSizingInfo.emptyWidth;

[fs, 2016/02/09 18:37:54]

Maybe consider adding accessors on IntrinsicSizingInfo and then get rid of the
hasIntrinsicWidth local - hasWidth/Height? (I find myself a bit at odds with the
"empty" prefix.)

[davve, 2016/02/11 08:52:37]

Turned it around to avoid "empty" prefix. Hopefully I don't need accessors at
this point.

 
         // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic width, then that intrinsic width is the used value of 'width'.
         if (computedHeightIsAuto && hasIntrinsicWidth)
             return computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit(constrainedSize.width()), shouldComputePreferred);
 
-        bool hasIntrinsicHeight = constrainedSize.height() > 0 || hasIntrinsicHeightForLayoutBox(contentLayoutObject);
+        bool hasIntrinsicHeight = !intrinsicSizingInfo.emptyHeight;
 
         if (intrinsicSizingInfo.aspectRatio) {
             // If 'height' and 'width' both have computed values of 'auto' and the element has no intrinsic width, but does have an intrinsic height and intrinsic ratio;
             // or if 'width' has a computed value of 'auto', 'height' has some other computed value, and the element does have an intrinsic ratio; then the used value
             // of 'width' is: (used height) * (intrinsic ratio)
             if (intrinsicSizingInfo.aspectRatio && ((computedHeightIsAuto && !hasIntrinsicWidth && hasIntrinsicHeight) || !computedHeightIsAuto)) {
                 LayoutUnit logicalHeight = computeReplacedLogicalHeight();
                 return computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit(logicalHeight * intrinsicSizingInfo.aspectRatio), shouldComputePreferred);
             }
 
@@ skipping 36 matching lines @@
         return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLogicalHeightUsing(MainOrPreferredSize, style()->logicalHeight()));
 
     LayoutBox* contentLayoutObject = embeddedContentBox();
 
     // 10.6.2 Inline, replaced elements: http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height
     IntrinsicSizingInfo intrinsicSizingInfo;
     computeIntrinsicSizingInfoForLayoutBox(contentLayoutObject, intrinsicSizingInfo);
     FloatSize constrainedSize = constrainIntrinsicSizeToMinMax(intrinsicSizingInfo);
 
     bool widthIsAuto = style()->logicalWidth().isAuto();
-    // TODO(shanmuga.m@samsung.com): hasIntrinsicWidth/Height information should be obtained
-    // from LayoutBox::computeIntrinsicSizingInfo().
-    bool hasIntrinsicHeight = constrainedSize.height() > 0 || hasIntrinsicHeightForLayoutBox(contentLayoutObject);
+    bool hasIntrinsicHeight = !intrinsicSizingInfo.emptyHeight;
 
     // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic height, then that intrinsic height is the used value of 'height'.
     if (widthIsAuto && hasIntrinsicHeight)
         return computeReplacedLogicalHeightRespectingMinMaxHeight(constrainedSize.height());
 
     // Otherwise, if 'height' has a computed value of 'auto', and the element has an intrinsic ratio then the used value of 'height' is:
     // (used width) / (intrinsic ratio)
     if (intrinsicSizingInfo.aspectRatio)
         return computeReplacedLogicalHeightRespectingMinMaxHeight(LayoutUnit(availableLogicalWidth() / intrinsicSizingInfo.aspectRatio));
 
@@ skipping 114 matching lines @@
     // We only include the space below the baseline in our layer's cached paint invalidation rect if the
     // image is selected. Since the selection state has changed update the rect.
     if (hasLayer())
         setPreviousPaintInvalidationRect(boundsRectForPaintInvalidation(containerForPaintInvalidation()));
 
     if (canUpdateSelectionOnRootLineBoxes())
         inlineBoxWrapper()->root().setHasSelectedChildren(state != SelectionNone);
 }
 
 } // namespace blink