Title: [105777] branches/chromium/963
- Revision
- 105777
- Author
- [email protected]
- Date
- 2012-01-24 12:42:03 -0800 (Tue, 24 Jan 2012)
Log Message
Merge 104322 - ASSERT failure due to combine-text with preceding spaces
BUG=90105
Review URL: https://chromiumcodereview.appspot.com/9284036
Modified Paths
Added Paths
Diff
Copied: branches/chromium/963/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt (from rev 104322, trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt) (0 => 105777)
--- branches/chromium/963/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt (rev 0)
+++ branches/chromium/963/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt 2012-01-24 20:42:03 UTC (rev 105777)
@@ -0,0 +1 @@
+
Copied: branches/chromium/963/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html (from rev 104322, trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html) (0 => 105777)
--- branches/chromium/963/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html (rev 0)
+++ branches/chromium/963/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html 2012-01-24 20:42:03 UTC (rev 105777)
@@ -0,0 +1,9 @@
+<body
+style="-webkit-columns: rosybrown; -webkit-writing-mode: vertical-lr; ">
+<div style="-webkit-hyphenate-character: floating; zoom: 900; -webkit-text-combine: horizontal; font-size: 600; ">
+ PASS if no ASSERT fail or crash in debug build.</div></body>
+
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
Modified: branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp (105776 => 105777)
--- branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-01-24 20:40:43 UTC (rev 105776)
+++ branches/chromium/963/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-01-24 20:42:03 UTC (rev 105777)
@@ -1889,6 +1889,10 @@
}
} else if (object->isFloating())
m_block->positionNewFloatOnLine(m_block->insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
+ else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText()) {
+ toRenderCombineText(object)->combineText();
+ continue;
+ }
resolver.increment();
}
resolver.commitExplicitEmbedding();
@@ -2274,7 +2278,7 @@
#endif
RenderStyle* style = t->style(lineInfo.isFirstLine());
- if (style->hasTextCombine() && current.m_obj->isCombineText())
+ if (style->hasTextCombine() && current.m_obj->isCombineText() && !toRenderCombineText(current.m_obj)->isCombined())
toRenderCombineText(current.m_obj)->combineText();
const Font& f = style->font();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
