Changeset 140931 in webkit

Timestamp:

Jan 27, 2013 5:55:04 PM (11 years ago)

Author:

falken@chromium.org

Message:

Elements must be reattached when inserted/removed from top layer
​https://bugs.webkit.org/show_bug.cgi?id=105489

Relanding r139402 as the apparent perf regression has been explained as not real (bug 106726).

Reviewed by Julien Chaffraix.

Source/WebCore:

Ensure a reattach occurs when an element is inserted/removed from top layer, so its renderer can be inserted correctly:
as a child of RenderView in top layer sibling order if it's in the top layer, and in the usual place otherwise.

We previously relied on style recalc to catch when an element is inserted/removed from the top layer, because it
only happens on dialog.show/close which toggle display: none. But that is incorrect because, for example, close()
followed immediately by show() results in no style change.

Tests: fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer.html

fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd.html

• dom/Element.cpp:

(WebCore::Element::removedFrom): Call Document::removeFromTopLayer to let the element be removed from the top layer vector.
removeFromTopLayer calls Element::setIsInTopLayer(false) itself if needed.
(WebCore::Element::setIsInTopLayer): Ensure a reattach occurs if the element is already attached.

LayoutTests:

• fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer-expected.html: Added.
• fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer.html: Added.

This tests that a top layer element removed from the document does not reappear in the top layer if readded.
This test actually would pass before this patch, but just by good fortune (see bug).

• fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd-expected.html: Added.
• fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd.html: Added.

This tests that top layer ordering is correct after removing and readding an element to the top layer.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer-expected.html (added)
• LayoutTests/fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer.html (added)
• LayoutTests/fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd-expected.html (added)
• LayoutTests/fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-27  Matt Falkenhagen  <falken@chromium.org>
+
+        Elements must be reattached when inserted/removed from top layer
+        https://bugs.webkit.org/show_bug.cgi?id=105489
+
+        Relanding r139402 as the apparent perf regression has been explained as not real (bug 106726).
+
+        Reviewed by Julien Chaffraix.
+
+        * fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer-expected.html: Added.
+        * fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer.html: Added.
+        This tests that a top layer element removed from the document does not reappear in the top layer if readded.
+        This test actually would pass before this patch, but just by good fortune (see bug).
+        * fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd-expected.html: Added.
+        * fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd.html: Added.
+        This tests that top layer ordering is correct after removing and readding an element to the top layer.
+
 2013-01-27  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-27  Matt Falkenhagen  <falken@chromium.org>
+
+        Elements must be reattached when inserted/removed from top layer
+        https://bugs.webkit.org/show_bug.cgi?id=105489
+
+        Relanding r139402 as the apparent perf regression has been explained as not real (bug 106726).
+
+        Reviewed by Julien Chaffraix.
+
+        Ensure a reattach occurs when an element is inserted/removed from top layer, so its renderer can be inserted correctly:
+        as a child of RenderView in top layer sibling order if it's in the top layer, and in the usual place otherwise.
+
+        We previously relied on style recalc to catch when an element is inserted/removed from the top layer, because it
+        only happens on dialog.show/close which toggle display: none. But that is incorrect because, for example, close()
+        followed immediately by show() results in no style change.
+
+        Tests: fast/dom/HTMLDialogElement/removed-element-is-removed-from-top-layer.html
+               fast/dom/HTMLDialogElement/top-layer-stacking-correct-order-remove-readd.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::removedFrom): Call Document::removeFromTopLayer to let the element be removed from the top layer vector.
+        removeFromTopLayer calls Element::setIsInTopLayer(false) itself if needed.
+        (WebCore::Element::setIsInTopLayer): Ensure a reattach occurs if the element is already attached.
+
 2013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1184 +1184 @@
 
 #if ENABLE(DIALOG_ELEMENT)
-    setIsInTopLayer(false);
+    document()->removeFromTopLayer(this);
 #endif
 #if ENABLE(FULLSCREEN_API)
@@ -2405 +2405 @@
         return;
     ensureElementRareData()->setIsInTopLayer(inTopLayer);
-    setNeedsStyleRecalc(SyntheticStyleChange);
+
+    // We must ensure a reattach occurs so the renderer is inserted in the correct sibling order under RenderView according to its
+    // top layer position, or in its usual place if not in the top layer.
+    reattachIfAttached();
 }
 #endif