Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: Source/WebCore/rendering/RenderBlockLineLayout.cpp

Issue 9565014: Merge 107733 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
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:
View side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderBlockLineLayout.cpp
===================================================================
--- Source/WebCore/rendering/RenderBlockLineLayout.cpp (revision 109352)
+++ Source/WebCore/rendering/RenderBlockLineLayout.cpp (working copy)
@@ -2362,7 +2362,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 »

Powered by Google App Engine
This is Rietveld 408576698