Source/core/layout/LayoutBlockFlow.h - Issue 1303993007: Floats' margins do not collapse with page or column boundaries.

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: Source/core/layout/LayoutBlockFlow.h

Issue 1303993007: Floats' margins do not collapse with page or column boundaries. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 3 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:

Index: Source/core/layout/LayoutBlockFlow.h

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

index f249e016c22a25f108ef7d204374da3cbceb0237..35f60f1664ab21dd55f901e358c5f0dc45342eee 100644

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

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

@@ -493,7 +493,7 @@ private:

// Computes a deltaOffset value that put a line at the top of the next page if it doesn't fit on the current page.

void adjustLinePositionForPagination(RootInlineBox&, LayoutUnit& deltaOffset);

// If the child is unsplittable and can't fit on the current page, return the top of the next page/column.

- LayoutUnit adjustForUnsplittableChild(LayoutBox&, LayoutUnit logicalOffset, bool includeMargins = false);

+ LayoutUnit adjustForUnsplittableChild(LayoutBox&, LayoutUnit logicalOffset);

// Used to store state between styleWillChange and styleDidChange

static bool s_canPropagateFloatIntoSibling;