Changeset 281014 in webkit

Timestamp:

Aug 13, 2021, 7:16:31 AM (5 years ago)

Author:

ntim@apple.com

Message:

Check for dialog existence in top layer in HTMLDialogElement::showModal & close
​https://bugs.webkit.org/show_bug.cgi?id=227907

Reviewed by Antti Koivisto.

Test: imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html

Test expectations are unchanged because the test uses elementFromPoint, meaning that behaviour difference isn't noticeable
until top layer rendering bits are implemented (which would change elementFromPoint's result by shuffling z-order based on top layer elements).

• dom/Element.h:

(WebCore::Element::isInTopLayer const):

• html/HTMLDialogElement.cpp:

(WebCore::HTMLDialogElement::showModal):
(WebCore::HTMLDialogElement::close):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• html/HTMLDialogElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-13  Tim Nguyen  <ntim@apple.com>
+
+        Check for dialog existence in top layer in HTMLDialogElement::showModal & close
+        https://bugs.webkit.org/show_bug.cgi?id=227907
+
+        Reviewed by Antti Koivisto.
+
+        Test: imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html
+
+        Test expectations are unchanged because the test uses elementFromPoint, meaning that behaviour difference isn't noticeable
+        until top layer rendering bits are implemented (which would change elementFromPoint's result by shuffling z-order based on top layer elements).
+
+        * dom/Element.h:
+        (WebCore::Element::isInTopLayer const):
+        * html/HTMLDialogElement.cpp:
+        (WebCore::HTMLDialogElement::showModal):
+        (WebCore::HTMLDialogElement::close):
+
 2021-08-13  Jean-Yves Avenard  <jya@apple.com>
 

trunk/Source/WebCore/dom/Element.h

@@ -512 +512 @@
     void setLastStyleChangeEventStyle(PseudoId, std::unique_ptr<const RenderStyle>&&);
 
+    bool isInTopLayer() const { return document().topLayerElements().contains(makeRef(*const_cast<Element*>(this))); }
+
 #if ENABLE(FULLSCREEN_API)
     bool containsFullScreenElement() const { return hasNodeFlag(NodeFlag::ContainsFullScreenElement); }

trunk/Source/WebCore/html/HTMLDialogElement.cpp

@@ -66 +66 @@
     m_isModal = true;
 
-    // FIXME: Only add dialog to top layer if it's not already in it. (webkit.org/b/227907)
-    document().addToTopLayer(*this);
+    if (!isInTopLayer())
+        document().addToTopLayer(*this);
 
     // FIXME: Add steps 8 & 9 from spec. (webkit.org/b/227537)
@@ -86 +86 @@
         m_returnValue = result;
 
-    // FIXME: Only remove dialog from top layer if it's inside it. (webkit.org/b/227907)
-    document().removeFromTopLayer(*this);
+    if (isInTopLayer())
+        document().removeFromTopLayer(*this);
 
     // FIXME: Add step 6 from spec. (webkit.org/b/227537)