Title: [109352] branches/chromium/963
- Revision
- 109352
- Author
- [email protected]
- Date
- 2012-03-01 09:41:53 -0800 (Thu, 01 Mar 2012)
Log Message
Merge 107733
BUG=104266
Review URL: https://chromiumcodereview.appspot.com/9565013
Modified Paths
Added Paths
Diff
Copied: branches/chromium/963/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt (from rev 107733, trunk/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt) (0 => 109352)
--- branches/chromium/963/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt (rev 0)
+++ branches/chromium/963/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash-expected.txt 2012-03-01 17:41:53 UTC (rev 109352)
@@ -0,0 +1 @@
+PASS if no assert or crash in debug
Copied: branches/chromium/963/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash.html (from rev 107733, trunk/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash.html) (0 => 109352)
--- branches/chromium/963/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash.html (rev 0)
+++ branches/chromium/963/LayoutTests/fast/css/counters/asterisk-counter-update-after-layout-crash.html 2012-03-01 17:41:53 UTC (rev 109352)
@@ -0,0 +1,19 @@
+<style>
+.x:after { content:counter(c, asterisks) ""; counter-increment:c 1550; }
+</style>
+<script>
+function runTest() {
+ document.styleSheets[0].insertRule("div { counter-reset: c 141170 }");
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+}
+window._onload_=runTest;
+</script>
+<div>
+ <span class="x">
+ <div></div>
+ <span class="x">
+ <p>
+ <p>
+ PASS if no assert or crash in debug
+</div>
Modified: branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp (109351 => 109352)
--- branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-01 17:30:47 UTC (rev 109351)
+++ branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-01 17:41:53 UTC (rev 109352)
@@ -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());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
