Source/core/layout/api/LineLayoutBlockFlow.h - Issue 1263923002: Revert of Refactor the treatment of shape-outside objects in float overlapping checks

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/api/LineLayoutBlockFlow.h

Issue 1263923002: Revert of Refactor the treatment of shape-outside objects in float overlapping checks (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

Index: Source/core/layout/api/LineLayoutBlockFlow.h

diff --git a/Source/core/layout/api/LineLayoutBlockFlow.h b/Source/core/layout/api/LineLayoutBlockFlow.h

index 8f88762fdbe88d7bac74dcc779ed30c576d48211..b1e38b924407aa7f7d989f5a7500afac3a0eb003 100644

--- a/Source/core/layout/api/LineLayoutBlockFlow.h

+++ b/Source/core/layout/api/LineLayoutBlockFlow.h

@@ -111,9 +111,9 @@

return toBlockFlow()->positionNewFloatOnLine(newFloat, lastFloatFromPreviousLine, lineInfo, lineWidth);

}

- LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit logicalHeight) const

+ LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit logicalHeight, ShapeOutsideFloatOffsetMode offsetMode = ShapeOutsideFloatMarginBoxOffset) const

{

- return toBlockFlow()->nextFloatLogicalBottomBelow(logicalHeight);

+ return toBlockFlow()->nextFloatLogicalBottomBelow(logicalHeight, offsetMode);

}

FloatingObject* lastFloatFromPreviousLine() const

« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | Source/core/layout/line/LineWidth.cpp » ('j') | no next file with comments »