[css-grid] Fix percentage height resolution for replaced elements

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

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index b79d4d6bbb6958acc35faf9942a375174d0ed3c5..c072de52ded346151f47082ced39804dea777108 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -555,7 +555,7 @@ LayoutBlock* LayoutBoxModelObject::containingBlockForAutoHeightDetection(Length
     return cb;
 }
 
-bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
+bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight(bool checkingContainingBlock) const

[svillar, 2016/07/07 11:45:48]

It's usually considered better to use an enum instead of a boolean, you might
need to add some other values later.

[Manuel Rego, 2016/07/07 14:40:57]

Ok, I can change this I'm thinking in something like:
    enum ObjectToCheck { CurrentObject, ContainingBlock };
    bool hasAutoHeightOrContainingBlockWithAutoHeight(ObjectToCheck =
CurrentObject) const;          

But I don't like it. :-/ Do you have a better suggestion? Thanks.

[cbiesinger, 2016/07/07 17:34:27]

To make sure I understand, callers should never pass true here, right? This is
only used for the internal implementation?

I'd be OK with keeping it as a bool in that circumstance, but can you add a
comment in the header saying that this is the case?

[Manuel Rego, 2016/07/08 07:57:04]

Yeah that's the idea.

Probably it'd be better that the public method has not arguments (like before).
And then we've a private method with the bool. E.g.
  public: 
      bool hasAutoHeightOrContainingBlockWithAutoHeight() const {
          return hasAutoHeightOrContainingBlockWithAutoHeight(false);
      }
  private:
      bool hasAutoHeightOrContainingBlockWithAutoHeight(bool
checkingContainingBlock) const {
          ...
      }

WDYT?

 {
     const LayoutBox* thisBox = isBox() ? toLayoutBox(this) : nullptr;
     Length logicalHeightLength = style()->logicalHeight();
@@ -567,6 +567,12 @@ bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
         if (flexBox.childLogicalHeightForPercentageResolution(*thisBox) != LayoutUnit(-1))
             return false;
     }
+    if (thisBox && thisBox->isGridItem()) {
+        if (checkingContainingBlock && thisBox->hasOverrideLogicalContentHeight())
+            return false;
+        if (!checkingContainingBlock && thisBox->hasOverrideContainingBlockLogicalHeight())
+            return false;
+    }
     if (logicalHeightLength.isAuto())
         return true;
 
@@ -575,7 +581,7 @@ bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
 
     // If the height of the containing block computes to 'auto', then it hasn't been 'specified explicitly'.
     if (cb)
-        return cb->hasAutoHeightOrContainingBlockWithAutoHeight();
+        return cb->hasAutoHeightOrContainingBlockWithAutoHeight(true);
     return false;
 }