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

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

Issue 2547933003: Stop searching for overhanging floats when the sibling's floats no longer overlap (Closed)
Patch Set: bug 670325 Created 4 years 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: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
index 704032fc14ec9a184f2913326d953e565e774172..8177bdd858125c547769a4ca26c915e38b5e97f6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -1809,6 +1809,8 @@ LayoutUnit LayoutBlockFlow::collapseMargins(LayoutBox& child,
previousBlockFlow->lowestFloatLogicalBottom();
if (lowestFloat > logicalTop)
addOverhangingFloats(previousBlockFlow, false);
+ else
+ break;
LayoutObject* prev = previousBlockFlow->previousSibling();
if (prev && prev->isLayoutBlockFlow())
previousBlockFlow = toLayoutBlockFlow(prev);
« 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