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

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

Issue 1221803003: Behave more normally for content taller than the fragmentainer it's in. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Manually rebaseline fast/repaint/multicol-with-text. Get rid of platform-specific expectations. Created 5 years, 5 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 | « Source/core/layout/LayoutFlowThread.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutFlowThread.cpp
diff --git a/Source/core/layout/LayoutFlowThread.cpp b/Source/core/layout/LayoutFlowThread.cpp
index 90fba5ebcf78f417cddd967f1e0da87c0fbbafd3..eca6be0a82beb3cdf1e5ac23ace3cd6fe37073cf 100644
--- a/Source/core/layout/LayoutFlowThread.cpp
+++ b/Source/core/layout/LayoutFlowThread.cpp
@@ -39,7 +39,6 @@ namespace blink {
LayoutFlowThread::LayoutFlowThread()
: LayoutBlockFlow(nullptr)
, m_columnSetsInvalidated(false)
- , m_columnSetsHaveUniformLogicalHeight(true)
, m_pageLogicalSizeChanged(false)
{
}
@@ -71,29 +70,7 @@ void LayoutFlowThread::invalidateColumnSets()
void LayoutFlowThread::validateColumnSets()
{
- if (m_columnSetsInvalidated) {
- m_columnSetsInvalidated = false;
- m_columnSetsHaveUniformLogicalHeight = true;
-
- if (hasColumnSets()) {
- LayoutUnit previousLogicalHeight = 0;
- bool firstVisited = false;
-
- for (auto* columnSet : m_multiColumnSetList) {
- LayoutUnit currentLogicalHeight = columnSet->pageLogicalHeight();
-
- if (!firstVisited) {
- firstVisited = true;
- } else {
- if (m_columnSetsHaveUniformLogicalHeight && previousLogicalHeight != currentLogicalHeight)
- m_columnSetsHaveUniformLogicalHeight = false;
- }
-
- previousLogicalHeight = currentLogicalHeight;
- }
- }
- }
-
+ m_columnSetsInvalidated = false;
updateLogicalWidth(); // Called to get the maximum logical width for the columnSet.
generateColumnSetIntervalTree();
}
« no previous file with comments | « Source/core/layout/LayoutFlowThread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698