Fix computation of min|max-content contribution of non-replaced blocks

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 2126 matching lines @@
         // If the child is an orthogonal flow, child's height determines the width, but the height is not available until layout.
         // http://dev.w3.org/csswg/css-writing-modes-3/#orthogonal-shrink-to-fit
         if (!child.needsLayout()) {
             minPreferredLogicalWidth = maxPreferredLogicalWidth = toLayoutBox(child).logicalHeight();
             return;
         }
         m_needsRecalcLogicalWidthAfterLayoutChildren = true;
         minPreferredLogicalWidth = maxPreferredLogicalWidth = toLayoutBox(child).computeLogicalHeightWithoutLayout();
         return;
     }
-    minPreferredLogicalWidth = child.minPreferredLogicalWidth();
-    maxPreferredLogicalWidth = child.maxPreferredLogicalWidth();
+
+    if (child.isLayoutBlock() && !child.isTable() && !child.isReplaced()) {

[mstensho (USE GERRIT), 2015/12/09 16:56:04]

Why exclude table?

[svillar, 2015/12/09 17:41:32]

Because there is a different section in the spec for tables. 

Even in the current code tables do very particular things when computing
intrinsic sizes. 

[mstensho (USE GERRIT), 2015/12/09 19:17:33]

This? http://imgur.com/osjEW7F

I think we should just let tables behave like regular blocks until the spec
comes up with something better than "???" :)

+        const Length& computedInlineSize = child.styleRef().logicalWidth();
+        if (computedInlineSize.isFitContent() || computedInlineSize.isFillAvailable() || computedInlineSize.isAuto()
+            || (computedInlineSize.hasPercent() && !toLayoutBox(child).percentageLogicalHeightIsResolvable())) {
+            minPreferredLogicalWidth = child.minPreferredLogicalWidth();
+            maxPreferredLogicalWidth = child.maxPreferredLogicalWidth();
+        } else {
+            ASSERT(computedInlineSize.isMinContent() || computedInlineSize.isMaxContent() || computedInlineSize.isSpecified());
+            LogicalExtentComputedValues computedValues;
+            toLayoutBlock(child).computeLogicalWidth(computedValues);

[mstensho (USE GERRIT), 2015/12/09 16:56:04]

How is this supposed to work if we haven't laid out yet and we haven't
calculated preferred minimum and maximum widths either. What is
computeLogicalWidth() going to do if width is e.g. max-content?

[svillar, 2015/12/09 17:41:32]

It will work because for min|max-content computeLogicalWidth() will call
computeIntrinsicLogicalWidths() which ends up calling
computePreferredLogicalWidths(). (if the width is specified then
computeLogicalWidth just returns that value)

[mstensho (USE GERRIT), 2015/12/09 19:17:33]

OK, that should work.

But I still think my suggestion is simpler.

+            minPreferredLogicalWidth = maxPreferredLogicalWidth = computedValues.m_extent;
+        }
+    } else {
+        // TODO(svillar): we leave the original implementation as default fallback. Still need to specialcase
+        // some other situations: https://drafts.csswg.org/css-sizing/#intrinsic
+        minPreferredLogicalWidth = child.minPreferredLogicalWidth();
+        maxPreferredLogicalWidth = child.maxPreferredLogicalWidth();
+    }
+
     if (child.isLayoutBlock() && toLayoutBlock(child).needsRecalcLogicalWidthAfterLayoutChildren())
         m_needsRecalcLogicalWidthAfterLayoutChildren = true;
 }
 
 bool LayoutBlock::hasLineIfEmpty() const
 {
     if (!node())
         return false;
 
     if (node()->isRootEditableElement())
@@ skipping 753 matching lines @@
 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const LayoutObject* obj) const
 {
     showLayoutObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink