Source/core/layout/line/BreakingContextInlineHeaders.h - Issue 1103883002: Convert Block code to layoutObject.

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 1103883002: Convert Block code to layoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 8 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/LayoutBlockFlowLine.cpp ('K') | « Source/core/layout/LayoutBlockFlowLine.cpp ('k') | Source/core/layout/line/LineWidth.cpp » ('j') | Source/core/layout/line/WordMeasurement.h » ('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 c255a686f1bfb6fa1167ee0c8492729ee58eb15c..26e05d35f3b0777630e7c2d3cfad22ffce8b2d96 100644

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

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

@@ -631,7 +631,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool

wordMeasurements.grow(wordMeasurements.size() + 1);

WordMeasurement& wordMeasurement = wordMeasurements.last();

- wordMeasurement.renderer = layoutText;

+ wordMeasurement.layoutObject = layoutText;

wordMeasurement.endOffset = m_current.offset();

wordMeasurement.startOffset = lastSpace;

@@ -796,7 +796,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool

wordMeasurements.grow(wordMeasurements.size() + 1);

WordMeasurement& wordMeasurement = wordMeasurements.last();

- wordMeasurement.renderer = layoutText;

+ wordMeasurement.layoutObject = layoutText;

// IMPORTANT: current.m_pos is > length here!

float additionalTempWidth = m_ignoringSpaces ? 0 : textWidth(layoutText, lastSpace, m_current.offset() - lastSpace, font, m_width.currentWidth(), m_collapseWhiteSpace, &wordMeasurement.fallbackFonts);