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

third_party/WebKit/Source/core/layout/LayoutBoxModelObject.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 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. 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 537 matching lines @@
     // the layout view. The available height is taken from the frame.
     if (cb->isLayoutView())
         return nullptr;
 
     if (cb->isOutOfFlowPositioned() && !cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isAuto())
         return nullptr;
 
     return cb;
 }
 
-bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
+bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight(bool checkingContainingBlock) const
 {
     const LayoutBox* thisBox = isBox() ? toLayoutBox(this) : nullptr;
     Length logicalHeightLength = style()->logicalHeight();
     LayoutBlock* cb = containingBlockForAutoHeightDetection(logicalHeightLength);
     if (logicalHeightLength.hasPercent() && cb && isBox())
         cb->addPercentHeightDescendant(const_cast<LayoutBox*>(toLayoutBox(this)));
     if (thisBox && thisBox->isFlexItem()) {
         LayoutFlexibleBox& flexBox = toLayoutFlexibleBox(*parent());
         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;
 
     if (document().inQuirksMode())
         return false;
 
     // 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;
 }
 
+bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
+{
+    return hasAutoHeightOrContainingBlockWithAutoHeight(false);
+}
+
 LayoutSize LayoutBoxModelObject::relativePositionOffset() const
 {
     LayoutSize offset = accumulateInFlowPositionOffsets();
 
     LayoutBlock* containingBlock = this->containingBlock();
 
     // Objects that shrink to avoid floats normally use available line width when computing containing block width.  However
     // in the case of relative positioning using percentages, we can't do this.  The offset should always be resolved using the
     // available width of the containing block.  Therefore we don't use containingBlockLogicalWidthForContent() here, but instead explicitly
     // call availableWidth on our containing block.
@@ skipping 523 matching lines @@
     if (rootElementStyle->hasBackground())
         return false;
 
     if (node() != document().firstBodyElement())
         return false;
 
     return true;
 }
 
 } // namespace blink