qtwebkit/qtwebkit-webkit72285.patch

44 lines
1.6 KiB
Diff

Index: trunk/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash-expected.txt
===================================================================
--- trunk/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash-expected.txt (revision 86060)
+++ trunk/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash-expected.txt (revision 86060)
@@ -0,0 +1,2 @@
+Test passes it it does not crash.
+
Index: trunk/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html
===================================================================
--- trunk/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html (revision 86060)
+++ trunk/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html (revision 86060)
@@ -0,0 +1,19 @@
+<html>
+<body onload="runTest()">
+Test passes it it does not crash.
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ function runTest()
+ {
+ document.body.offsetTop;
+ child = document.getElementById('test');
+ child.parentNode.removeChild(child);
+ }
+</script>
+<br>
+<span id="test"></span>
+</body>
+</html>
+
Index: trunk/Source/WebCore/rendering/RenderInline.cpp
===================================================================
--- trunk/Source/WebCore/rendering/RenderInline.cpp (revision 86059)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp (revision 86060)
@@ -100,5 +100,6 @@
box->remove();
}
- }
+ } else if (parent())
+ parent()->dirtyLinesFromChangedChild(this);
}