Title: [94032] branches/chromium/835
- Revision
- 94032
- Author
- [email protected]
- Date
- 2011-08-29 16:42:22 -0700 (Mon, 29 Aug 2011)
Log Message
Merge 94001
BUG=91911
Review URL: http://codereview.chromium.org/7795013
Modified Paths
Added Paths
Diff
Copied: branches/chromium/835/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt (from rev 94001, trunk/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt) (0 => 94032)
--- branches/chromium/835/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt (rev 0)
+++ branches/chromium/835/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt 2011-08-29 23:42:22 UTC (rev 94032)
@@ -0,0 +1 @@
+PASS
Copied: branches/chromium/835/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html (from rev 94001, trunk/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html) (0 => 94032)
--- branches/chromium/835/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html (rev 0)
+++ branches/chromium/835/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html 2011-08-29 23:42:22 UTC (rev 94032)
@@ -0,0 +1,24 @@
+<html>
+<style>
+ body { direction: rtl; padding-left: 100%; }
+</style>
+<script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ function runTest() {
+ document.body.innerHTML = "PASS";
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ setTimeout("runTest()", 0);
+</script>
+0<image>
+<span>
+A<div></div>
+</span>
+</html>
\ No newline at end of file
Modified: branches/chromium/835/Source/WebCore/rendering/RenderBox.cpp (94031 => 94032)
--- branches/chromium/835/Source/WebCore/rendering/RenderBox.cpp 2011-08-29 23:39:51 UTC (rev 94031)
+++ branches/chromium/835/Source/WebCore/rendering/RenderBox.cpp 2011-08-29 23:42:22 UTC (rev 94032)
@@ -1365,6 +1365,8 @@
box->destroy(renderArena());
} else if (isReplaced()) {
setLocation(roundedIntPoint(FloatPoint(box->x(), box->y())));
+ if (m_inlineBoxWrapper)
+ deleteLineBoxWrapper();
m_inlineBoxWrapper = box;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
