Title: [103431] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (103430 => 103431)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2011-12-21 20:31:53 UTC (rev 103430)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2011-12-21 20:35:40 UTC (rev 103431)
@@ -1,5 +1,20 @@
2011-12-21 Lucas Forschler <[email protected]>
+ Merge 94001
+
+ 2011-08-29 Abhishek Arya <[email protected]>
+
+ Crash in InlineBox::deleteLine due to accessing removed
+ renderer.
+ https://bugs.webkit.org/show_bug.cgi?id=66015
+
+ Reviewed by Simon Fraser.
+
+ * fast/block/line-layout/inline-box-wrapper-crash-expected.txt: Added.
+ * fast/block/line-layout/inline-box-wrapper-crash.html: Added.
+
+2011-12-21 Lucas Forschler <[email protected]>
+
Merge 93943
2011-08-27 Anders Carlsson <[email protected]>
Copied: branches/safari-534.54-branch/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 => 103431)
--- branches/safari-534.54-branch/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt 2011-12-21 20:35:40 UTC (rev 103431)
@@ -0,0 +1 @@
+PASS
Copied: branches/safari-534.54-branch/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 => 103431)
--- branches/safari-534.54-branch/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html 2011-12-21 20:35:40 UTC (rev 103431)
@@ -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/safari-534.54-branch/Source/WebCore/ChangeLog (103430 => 103431)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2011-12-21 20:31:53 UTC (rev 103430)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2011-12-21 20:35:40 UTC (rev 103431)
@@ -1,5 +1,24 @@
2011-12-21 Lucas Forschler <[email protected]>
+ Merge 94001
+
+ 2011-08-29 Abhishek Arya <[email protected]>
+
+ Crash in InlineBox::deleteLine due to accessing removed
+ renderer.
+ https://bugs.webkit.org/show_bug.cgi?id=66015
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/block/line-layout/inline-box-wrapper-crash.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::positionLineBox): Make sure that the
+ previous inline box wrapper is destroyed properly, before
+ setting a new one.
+
+2011-12-21 Lucas Forschler <[email protected]>
+
Merge 93943
2011-08-27 Anders Carlsson <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderBox.cpp (103430 => 103431)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderBox.cpp 2011-12-21 20:31:53 UTC (rev 103430)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderBox.cpp 2011-12-21 20:35:40 UTC (rev 103431)
@@ -1388,6 +1388,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
