Changeset 109352 in webkit

Timestamp:

Mar 1, 2012, 9:41:53 AM (15 years ago)

Author:

cevans@google.com

Message:

Merge 107733
BUG=104266
Review URL: ​https://chromiumcodereview.appspot.com/9565013

Location:

branches/chromium/963

Files:

• LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt )
• LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash.html (copied) (copied from trunk/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash.html )
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2336 +2336 @@
                 }
 
-                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());