third_party/WebKit/Source/core/layout/LayoutBlock.h - Issue 1759853003: Merge contiguous anonymous blocks after removing a float or out-of-pos-element between them

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/LayoutBlock.h

Issue 1759853003: Merge contiguous anonymous blocks after removing a float or out-of-pos-element between them (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@585604-4

Patch Set: Created 4 years, 10 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:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/fast/block/float/add-float-back-to-anonymous-block-previous.html ('K') | « third_party/WebKit/LayoutTests/fast/block/float/add-float-back-to-anonymous-block-previous-expected.txt ('k') | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a42c01396320175ab437f6dd528868888219ed60..d6a5ed6a221cc11e90b59b5e9b8e2f2ebb59b213 100644

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

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

@@ -456,6 +456,7 @@ public:

LayoutUnit calculatePaginationStrutToFitContent(LayoutUnit offset, LayoutUnit strutToNextPage, LayoutUnit contentLogicalHeight) const;

static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child);

+ void collapseAnonymousBlockChildAfterMerge(LayoutObject* prev, LayoutObject* next, bool canMergeAnonymousBlocks);

mstensho (USE GERRIT) 2016/03/04 08:46:24 Please add a blank line before "protected:"

protected:

bool isPageLogicalHeightKnown(LayoutUnit logicalOffset) const { return pageLogicalHeightForOffset(logicalOffset); }