third_party/WebKit/Source/core/layout/LayoutBlockFlow.h - Issue 2542723002: Margins that start at fragmentainer boundaries should be collapsed away.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2542723002: Margins that start at fragmentainer boundaries should be collapsed away. (Closed)

Patch Set: Back out an unnecessary and potentially harmful change. 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:

Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

index 13872c04beff4915d836ee7fc4fdea9c364d41ff..3ae25bcba0eadf1aaaae1163c05802be74b3e99c 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

@@ -778,8 +778,14 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {

return maxPositiveMarginAfter() - maxNegativeMarginAfter();

}

+ LayoutUnit adjustedMarginBeforeForPagination(

+ const LayoutBox&,

+ LayoutUnit logicalTopMarginEdge,

+ LayoutUnit logicalTopBorderEdge,

+ const BlockChildrenLayoutInfo&) const;

LayoutUnit collapseMargins(LayoutBox& child,

- MarginInfo&,

+ BlockChildrenLayoutInfo&,

bool childIsSelfCollapsing,

bool childDiscardMarginBefore,

bool childDiscardMarginAfter);