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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 1549153002: Fix preferred logical widths of orthogonal writing modes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (merge conflict resolved) Created 4 years, 11 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
Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
index 376b79f48e6315b0c1afdfaf9a5632d86a8feefa..419900542433ca87b55e72e8d7de3688cce9a43b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
@@ -132,7 +132,6 @@ LayoutBlock::LayoutBlock(ContainerNode* node)
, m_widthAvailableToChildrenChanged(false)
, m_hasOnlySelfCollapsingChildren(false)
, m_descendantsWithFloatsMarkedForLayout(false)
- , m_needsRecalcLogicalWidthAfterLayoutChildren(false)
, m_hasPositionedObjects(false)
, m_hasPercentHeightDescendants(false)
{
@@ -2075,7 +2074,6 @@ void LayoutBlock::computeChildPreferredLogicalWidths(LayoutObject& child, Layout
minPreferredLogicalWidth = maxPreferredLogicalWidth = toLayoutBox(child).logicalHeight();
return;
}
- m_needsRecalcLogicalWidthAfterLayoutChildren = true;
minPreferredLogicalWidth = maxPreferredLogicalWidth = toLayoutBox(child).computeLogicalHeightWithoutLayout();
return;
}
@@ -2091,9 +2089,6 @@ void LayoutBlock::computeChildPreferredLogicalWidths(LayoutObject& child, Layout
else if (computedInlineSize.isMinContent())
maxPreferredLogicalWidth = minPreferredLogicalWidth;
}
-
- if (child.isLayoutBlock() && toLayoutBlock(child).needsRecalcLogicalWidthAfterLayoutChildren())
- m_needsRecalcLogicalWidthAfterLayoutChildren = true;
}
bool LayoutBlock::hasLineIfEmpty() const

Powered by Google App Engine
This is Rietveld 408576698