[css-grid] Clearing override sizes before running grid's layout logic.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. 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
@@ skipping 1157 matching lines @@
     if (m_rareData)
         m_rareData->m_overrideLogicalContentHeight = LayoutUnit(-1);
 }
 
 void LayoutBox::clearOverrideLogicalContentWidth()
 {
     if (m_rareData)
         m_rareData->m_overrideLogicalContentWidth = LayoutUnit(-1);
 }
 
+bool LayoutBox::hasOverrideSize()
+{
+    return hasOverrideLogicalContentWidth() || hasOverrideLogicalContentHeight();
+}
+
 void LayoutBox::clearOverrideSize()
 {
     clearOverrideLogicalContentHeight();
     clearOverrideLogicalContentWidth();
 }
 
 LayoutUnit LayoutBox::overrideLogicalContentWidth() const
 {
     ASSERT(hasOverrideLogicalContentWidth());
     return m_rareData->m_overrideLogicalContentWidth;
@@ skipping 40 matching lines @@
 }
 
 // TODO (lajava) Shouldn't we implement these functions based on physical direction ?.
 void LayoutBox::setOverrideContainingBlockContentLogicalHeight(LayoutUnit logicalHeight)
 {
     DCHECK_GE(logicalHeight, LayoutUnit(-1));
     ensureRareData().m_overrideContainingBlockContentLogicalHeight = logicalHeight;
     ensureRareData().m_hasOverrideContainingBlockContentLogicalHeight = true;
 }
 
 // TODO (lajava) Shouldn't we implement these functions based on physical direction ?.

[cbiesinger, 2016/09/26 11:48:33]

I don't think this new function needs that comment -- the function signature is
independent of logical vs physical size

[jfernandez, 2016/09/26 13:38:02]

Acknowledged.

+bool LayoutBox::hasContainingBlockOverrideSize()
+{
+    if (!m_rareData)
+        return false;
+    return ensureRareData().m_hasOverrideContainingBlockContentLogicalWidth || ensureRareData().m_hasOverrideContainingBlockContentLogicalHeight;
+}
+
+// TODO (lajava) Shouldn't we implement these functions based on physical direction ?.
 void LayoutBox::clearContainingBlockOverrideSize()
 {
     if (!m_rareData)
         return;
     ensureRareData().m_hasOverrideContainingBlockContentLogicalWidth = false;
     ensureRareData().m_hasOverrideContainingBlockContentLogicalHeight = false;
 }
 
 // TODO (lajava) Shouldn't we implement these functions based on physical direction ?.
 void LayoutBox::clearOverrideContainingBlockContentLogicalHeight()
@@ skipping 3625 matching lines @@
     LayoutRect rect = frameRect();
 
     LayoutBlock* block = containingBlock();
     if (block)
         block->adjustChildDebugRect(rect);
 
     return rect;
 }
 
 } // namespace blink