Source/core/layout/line/BreakingContextInlineHeaders.h - Issue 763173003: Convert RenderBlockFlow code to use FloatingObject references

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/line/BreakingContextInlineHeaders.h

Issue 763173003: Convert RenderBlockFlow code to use FloatingObject references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: more usage of const with floatingObject Created 5 years, 6 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

« Source/core/layout/LayoutBlockFlow.h ('K') | « Source/core/layout/LayoutBlockFlowLine.cpp ('k') | Source/core/layout/line/LineBreaker.cpp » ('j') | Source/core/layout/line/LineBreaker.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/line/BreakingContextInlineHeaders.h

diff --git a/Source/core/layout/line/BreakingContextInlineHeaders.h b/Source/core/layout/line/BreakingContextInlineHeaders.h

index 4e097318f2d763bbec68c463f24250eb1f015d55..c9e2a5321b9fd3a77b0f3c01549894157e7fbcbb 100644

--- a/Source/core/layout/line/BreakingContextInlineHeaders.h

+++ b/Source/core/layout/line/BreakingContextInlineHeaders.h

@@ -372,8 +372,8 @@ inline void BreakingContext::handleFloat()

// If it does, position it now, otherwise, position

// it after moving to next line (in newLine() func)

// FIXME: Bug 110372: Properly position multiple stacked floats with non-rectangular shape outside.

- if (m_floatsFitOnLine && m_width.fitsOnLine(m_block->logicalWidthForFloat(floatingObject).toFloat(), ExcludeWhitespace)) {

- m_block->positionNewFloatOnLine(floatingObject, m_lastFloatFromPreviousLine, m_lineInfo, m_width);

+ if (m_floatsFitOnLine && m_width.fitsOnLine(m_block->logicalWidthForFloat(*floatingObject).toFloat(), ExcludeWhitespace)) {

+ m_block->positionNewFloatOnLine(*floatingObject, m_lastFloatFromPreviousLine, m_lineInfo, m_width);

if (m_lineBreak.object() == m_current.object()) {

ASSERT(!m_lineBreak.offset());

m_lineBreak.increment();