Changeset 150155 in webkit

Timestamp:

May 15, 2013 3:59:20 PM (11 years ago)

Author:

igor.o@sisa.samsung.com

Message:

Implement run-in remove child cases.
​https://bugs.webkit.org/show_bug.cgi?id=86520

Move runin to original position when sibling element is destroyed.

Reviewed by David Hyatt.

Source/WebCore:

Tests: fast/runin/runin-remove-child-simple.html

fast/runin/runin-sibling-inline.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::willBeDestroyed):
(WebCore::RenderBlock::moveRunInUnderSiblingBlockIfNeeded):

If moveRunInUnderSiblingBlockIfNeeded is called when the sibling run-in block
is being destroyed, it means that the run-in is moving to original position and
we do not need to do nothing.

LayoutTests:

• fast/runin/runin-remove-child-simple-expected.txt: Added.
• fast/runin/runin-remove-child-simple.html: Added.
• fast/runin/runin-sibling-inline-expected.txt: Added.
• fast/runin/runin-sibling-inline.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/runin/runin-remove-child-simple-expected.txt (added)
• LayoutTests/fast/runin/runin-remove-child-simple.html (added)
• LayoutTests/fast/runin/runin-sibling-inline-expected.txt (added)
• LayoutTests/fast/runin/runin-sibling-inline.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-15  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        Implement run-in remove child cases.
+        https://bugs.webkit.org/show_bug.cgi?id=86520
+
+        Move runin to original position when sibling element is destroyed.
+
+        Reviewed by David Hyatt.
+
+        * fast/runin/runin-remove-child-simple-expected.txt: Added.
+        * fast/runin/runin-remove-child-simple.html: Added.
+        * fast/runin/runin-sibling-inline-expected.txt: Added.
+        * fast/runin/runin-sibling-inline.html: Added.
+
 2013-05-15  Dongseong Hwang  <dongseong.hwang@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-15  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        Implement run-in remove child cases.
+        https://bugs.webkit.org/show_bug.cgi?id=86520
+
+        Move runin to original position when sibling element is destroyed.
+
+        Reviewed by David Hyatt.
+
+        Tests: fast/runin/runin-remove-child-simple.html
+               fast/runin/runin-sibling-inline.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::willBeDestroyed):
+        (WebCore::RenderBlock::moveRunInUnderSiblingBlockIfNeeded):
+            If moveRunInUnderSiblingBlockIfNeeded is called when the sibling run-in block
+            is being destroyed, it means that the run-in is moving to original position and
+            we do not need to do nothing.
+
 2013-05-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -257 +257 @@
     m_beingDestroyed = true;
 
+    if (!documentBeingDestroyed()) {
+        if (firstChild() && firstChild()->isRunIn())
+            moveRunInToOriginalPosition(firstChild());
+    }
+
     // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
     // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
@@ -1983 +1988 @@
         return;
 
+    if (toRenderBlock(curr)->beingDestroyed())
+        return;
+
     // Per CSS3, "A run-in cannot run in to a block that already starts with a
     // run-in or that itself is a run-in".