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

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

Issue 2473953003: Don't let a column spanner affect the self-margin-collapsing state of the parent. (Closed)
Patch Set: Created 4 years, 1 month 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 | « third_party/WebKit/LayoutTests/fast/multicol/dynamic/remove-spanner-in-empty-nested-block-crash.html ('k') | 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 c633ed2fc07dfc64fb31b29b623f75520fd98366..5f19e9846581bf878384cbc3ec1381d4178425ce 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -424,11 +424,10 @@ bool LayoutBlockFlow::checkIfIsSelfCollapsingBlock() const {
return !firstLineBox();
// Whether or not we collapse is dependent on whether all our normal flow
- // children
- // are also self-collapsing.
+ // children are also self-collapsing.
for (LayoutBox* child = firstChildBox(); child;
child = child->nextSiblingBox()) {
- if (child->isFloatingOrOutOfFlowPositioned())
+ if (child->isFloatingOrOutOfFlowPositioned() || child->isColumnSpanAll())
continue;
if (!child->isSelfCollapsingBlock())
return false;
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/multicol/dynamic/remove-spanner-in-empty-nested-block-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698