Source/WebCore/rendering/RenderBlockLineLayout.cpp - Issue 9565013: Merge 107733

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 9565013: Merge 107733 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/

Patch Set: Created 8 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:

Index: Source/WebCore/rendering/RenderBlockLineLayout.cpp

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

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

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

@@ -2335,7 +2335,7 @@

midWordBreak = width.committedWidth() + wrapW + charWidth > width.availableWidth();

}

- if (lineBreakIteratorInfo.first != t) {

+ if ((lineBreakIteratorInfo.first != t) || (lineBreakIteratorInfo.second.string() != t->characters())) {

lineBreakIteratorInfo.first = t;

lineBreakIteratorInfo.second.reset(t->characters(), t->textLength(), style->locale());

}

« no previous file with comments | « LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt ('k') | no next file » | no next file with comments »