[css-grid] Fix percentage height resolution on 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 672 matching lines @@
   // view. The available height is taken from the frame.
   if (cb->isLayoutView())
     return nullptr;
 
   if (isOutOfFlowPositionedWithImplicitHeight(cb))
     return nullptr;
 
   return cb;
 }
 
-bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight(
-    bool checkingContainingBlock) const {
+bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight()
+    const {
   // TODO(rego): Check if we can somehow reuse LayoutBlock::
   // availableLogicalHeightForPercentageComputation() (see crbug.com/635655).
   const LayoutBox* thisBox = isBox() ? toLayoutBox(this) : nullptr;
   Length logicalHeightLength = style()->logicalHeight();
   LayoutBlock* cb = containingBlockForAutoHeightDetection(logicalHeightLength);
   if (logicalHeightLength.isPercentOrCalc() && 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 (thisBox && thisBox->isGridItem() &&
+      thisBox->hasOverrideContainingBlockLogicalHeight())
+    return false;
   if (logicalHeightLength.isAuto() &&
       !isOutOfFlowPositionedWithImplicitHeight(this))
     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(true);
+    return !cb->hasDefiniteLogicalHeight();
+
   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
@@ skipping 642 matching lines @@
   if (rootElementStyle->hasBackground())
     return false;
 
   if (node() != document().firstBodyElement())
     return false;
 
   return true;
 }
 
 }  // namespace blink