Source/WebCore/rendering/RenderBlockLineLayout.cpp - Issue 11299286: Merge 136034

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/WebCore/rendering/RenderBlockLineLayout.cpp

Issue 11299286: Merge 136034 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 years, 1 month 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/WebCore/rendering/RenderBlockLineLayout.cpp

===================================================================

--- Source/WebCore/rendering/RenderBlockLineLayout.cpp (revision 136279)

+++ Source/WebCore/rendering/RenderBlockLineLayout.cpp (working copy)

@@ -2627,7 +2627,7 @@

wordMeasurement.startOffset = lastSpace;

float additionalTmpW;

- if (wordTrailingSpaceWidth && currentCharacterIsSpace)

+ if (wordTrailingSpaceWidth && c == ' ')

additionalTmpW = textWidth(t, lastSpace, current.m_pos + 1 - lastSpace, f, width.currentWidth(), isFixedPitch, collapseWhiteSpace, &wordMeasurement.fallbackFonts, textLayout) - wordTrailingSpaceWidth;

else

additionalTmpW = textWidth(t, lastSpace, current.m_pos - lastSpace, f, width.currentWidth(), isFixedPitch, collapseWhiteSpace, &wordMeasurement.fallbackFonts, textLayout);

« no previous file with comments | « LayoutTests/fast/text/tab-with-kerning-expected.html ('k') | no next file » | no next file with comments »