Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: Source/core/layout/LayoutBox.cpp

Issue 1128433003: quirky WIP Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBox.cpp
diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp
index 1438e363790a3f27f96e6331b4142f88d6e80248..76a796bd8a37f2c73ead8abd630cdbc1515fccd6 100644
--- a/Source/core/layout/LayoutBox.cpp
+++ b/Source/core/layout/LayoutBox.cpp
@@ -2487,7 +2487,7 @@ LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const
LayoutBlock* cb = containingBlock();
const LayoutBox* containingBlockChild = this;
LayoutUnit rootMarginBorderPaddingHeight = 0;
- while (!cb->isLayoutView() && skipContainingBlockForPercentHeightCalculation(cb)) {
+ while (!cb->isLayoutView() && height.type() == Percent && skipContainingBlockForPercentHeightCalculation(cb)) {
if (cb->isBody() || cb->isDocumentElement())
rootMarginBorderPaddingHeight += cb->marginBefore() + cb->marginAfter() + cb->borderAndPaddingLogicalHeight();
skippedAutoHeightContainingBlock = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698