Title: [100576] branches/chromium/912
- Revision
- 100576
- Author
- cev...@google.com
- Date
- 2011-11-17 00:42:18 -0800 (Thu, 17 Nov 2011)
Log Message
Merge 99462
BUG=91911
Review URL: http://codereview.chromium.org/8586021
Modified Paths
Added Paths
Diff
Copied: branches/chromium/912/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash-expected.txt (from rev 99462, trunk/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash-expected.txt) (0 => 100576)
--- branches/chromium/912/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash-expected.txt (rev 0)
+++ branches/chromium/912/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash-expected.txt 2011-11-17 08:42:18 UTC (rev 100576)
@@ -0,0 +1 @@
+PASS, if no crash or exceptions thrown
Copied: branches/chromium/912/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash.html (from rev 99462, trunk/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash.html) (0 => 100576)
--- branches/chromium/912/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash.html (rev 0)
+++ branches/chromium/912/LayoutTests/fast/text/international/bidi-neutral-in-mixed-direction-run-crash.html 2011-11-17 08:42:18 UTC (rev 100576)
@@ -0,0 +1,25 @@
+<html>
+<style>
+ body { direction: rtl; padding-left: 100%; }
+</style>
+<script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ function runTest() {
+ document.body.innerHTML = "PASS, if no crash or exceptions thrown";
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ setTimeout("runTest()", 0);
+</script>
+0<span>
+<image>
+A 0<div></div>
+</span>
+</html>
+
Modified: branches/chromium/912/Source/WebCore/rendering/InlineIterator.h (100575 => 100576)
--- branches/chromium/912/Source/WebCore/rendering/InlineIterator.h 2011-11-17 08:37:08 UTC (rev 100575)
+++ branches/chromium/912/Source/WebCore/rendering/InlineIterator.h 2011-11-17 08:42:18 UTC (rev 100576)
@@ -464,7 +464,7 @@
template <>
inline void InlineBidiResolver::appendRun()
{
- if (!m_emptyRun && !m_eor.atEnd()) {
+ if (!m_emptyRun && !m_eor.atEnd() && !m_reachedEndOfLine) {
// Keep track of when we enter/leave "unicode-bidi: isolate" inlines.
// Initialize our state depending on if we're starting in the middle of such an inline.
// FIXME: Could this initialize from this->inIsolate() instead of walking up the render tree?
Modified: branches/chromium/912/Source/WebCore/rendering/RenderBox.cpp (100575 => 100576)
--- branches/chromium/912/Source/WebCore/rendering/RenderBox.cpp 2011-11-17 08:37:08 UTC (rev 100575)
+++ branches/chromium/912/Source/WebCore/rendering/RenderBox.cpp 2011-11-17 08:42:18 UTC (rev 100576)
@@ -1483,8 +1483,7 @@
box->destroy(renderArena());
} else if (isReplaced()) {
setLocation(roundedLayoutPoint(FloatPoint(box->x(), box->y())));
- if (m_inlineBoxWrapper)
- deleteLineBoxWrapper();
+ ASSERT(!m_inlineBoxWrapper);
m_inlineBoxWrapper = box;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
