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

Unified Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 700743002: Remove margin collapsing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 | « sky/engine/core/rendering/RenderBox.h ('k') | sky/tests/layout/margins.sky » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.cpp
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index 4c7a16ef4386f92b555172205ccfb58147673a73..1188048d9d1c199dc97c93da14ddf9a823691d39 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -3681,10 +3681,7 @@ LayoutRect RenderBox::layoutOverflowRectForPropagation(RenderStyle* parentStyle)
{
// Only propagate interior layout overflow if we don't clip it.
LayoutRect rect = borderBoxRect();
- // We want to include the margin, but only when it adds height. Quirky margins don't contribute height
- // nor do the margins of self-collapsing blocks.
- if (!style()->hasMarginAfterQuirk() && !isSelfCollapsingBlock())
- rect.expand(LayoutSize(LayoutUnit(), marginAfter()));
+ rect.expand(LayoutSize(LayoutUnit(), marginAfter()));
if (!hasOverflowClip())
rect.unite(layoutOverflowRect());
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/tests/layout/margins.sky » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698