Title: [122000] releases/WebKitGTK/webkit-1.8
Revision
122000
Author
[email protected]
Date
2012-07-06 13:02:21 -0700 (Fri, 06 Jul 2012)

Log Message

Merge 116325 - Crash in RenderBlock::updateFirstLetterStyle.
https://bugs.webkit.org/show_bug.cgi?id=85759

Patch by Abhishek Arya <[email protected]> on 2012-05-07
Reviewed by Julien Chaffraix.

Source/WebCore:

Test: fast/css-generated-content/first-letter-next-sibling-crash.html

RenderBlock::removeChild can bring up the children from last single anonymous block,
causing |nextSibling| in RenderBlock::updateFirstLetterStyle to go stale. We prevent
this by removing the child safely using removeChildNode before destroying it.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::updateFirstLetterStyle):

LayoutTests:

* fast/css-generated-content/first-letter-next-sibling-crash-expected.txt: Added.
* fast/css-generated-content/first-letter-next-sibling-crash.html: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (121999 => 122000)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog	2012-07-06 20:02:12 UTC (rev 121999)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog	2012-07-06 20:02:21 UTC (rev 122000)
@@ -1,3 +1,13 @@
+2012-05-07  Abhishek Arya  <[email protected]>
+
+        Crash in RenderBlock::updateFirstLetterStyle.
+        https://bugs.webkit.org/show_bug.cgi?id=85759
+
+        Reviewed by Julien Chaffraix.
+
+        * fast/css-generated-content/first-letter-next-sibling-crash-expected.txt: Added.
+        * fast/css-generated-content/first-letter-next-sibling-crash.html: Added.
+
 2012-05-04  Abhishek Arya  <[email protected]>
 
         ASSERT(beforeChildAnonymousContainer->isTable()); fails in RenderBlock::addChildIgnoringAnonymousColumnBlocks.

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash-expected.txt (0 => 122000)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash-expected.txt	                        (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash-expected.txt	2012-07-06 20:02:21 UTC (rev 122000)
@@ -0,0 +1,2 @@
+WebKit Bug 85759 - Crash in RenderBlock::updateFirstLetterStyle.
+PASS if test does not crash.
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash-expected.txt
___________________________________________________________________

Added: svn:eol-style

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash.html (0 => 122000)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash.html	2012-07-06 20:02:21 UTC (rev 122000)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<style>
+.absolutePosition { position: fixed; }
+.float:before { float: right; content: ''; }
+.float:first-letter { float: right; }
+.inline::first-letter { content: ''; }
+</style>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+function startTest() {
+    document.body.offsetTop;
+    var parent = document.getElementById("parent");
+    var child = document.getElementById("child");
+    child.setAttribute('class', 'inline');
+    document.body.offsetTop;
+    parent.removeChild(child);
+    document.body.offsetTop;
+    parent.setAttribute('class', 'inline');
+}
+window._onload_ = startTest;
+</script>
+WebKit Bug 85759 - Crash in RenderBlock::updateFirstLetterStyle.
+<div class="float" id="parent">
+<div class="absolutePosition" id="child"></div>
+PASS if test does not crash.
+</div>
+</html>
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/css-generated-content/first-letter-next-sibling-crash.html
___________________________________________________________________

Added: svn:executable

Added: svn:eol-style

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (121999 => 122000)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-07-06 20:02:12 UTC (rev 121999)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-07-06 20:02:21 UTC (rev 122000)
@@ -1,3 +1,19 @@
+2012-05-07  Abhishek Arya  <[email protected]>
+
+        Crash in RenderBlock::updateFirstLetterStyle.
+        https://bugs.webkit.org/show_bug.cgi?id=85759
+
+        Reviewed by Julien Chaffraix.
+
+        Test: fast/css-generated-content/first-letter-next-sibling-crash.html
+
+        RenderBlock::removeChild can bring up the children from last single anonymous block,
+        causing |nextSibling| in RenderBlock::updateFirstLetterStyle to go stale. We prevent
+        this by removing the child safely using removeChildNode before destroying it.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateFirstLetterStyle):
+
 2012-05-04  Abhishek Arya  <[email protected]>
 
         ASSERT(beforeChildAnonymousContainer->isTable()); fails in RenderBlock::addChildIgnoringAnonymousColumnBlocks.

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBlock.cpp (121999 => 122000)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBlock.cpp	2012-07-06 20:02:12 UTC (rev 121999)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBlock.cpp	2012-07-06 20:02:21 UTC (rev 122000)
@@ -5836,6 +5836,9 @@
                 remainingText->setFirstLetter(newFirstLetter);
                 toRenderBoxModelObject(newFirstLetter)->setFirstLetterRemainingText(remainingText);
             }
+            // To prevent removal of single anonymous block in RenderBlock::removeChild and causing
+            // |nextSibling| to go stale, we remove the old first letter using removeChildNode first.
+            firstLetterContainer->virtualChildren()->removeChildNode(firstLetterContainer, firstLetter);
             firstLetter->destroy();
             firstLetter = newFirstLetter;
             firstLetterContainer->addChild(firstLetter, nextSibling);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to