Changeset 243661 in webkit

Timestamp:

Mar 29, 2019 1:46:57 PM (5 years ago)

Author:

Chris Dumez

Message:

Set window.closed immediately when close() is invoked
​https://bugs.webkit.org/show_bug.cgi?id=195409

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

Rebaseline WPT tests now that more checks are passing.

• web-platform-tests/html/browsers/the-window-object/close-method.window-expected.txt:
• web-platform-tests/html/browsers/the-window-object/closed-attribute.window-expected.txt:

Source/WebCore:

Window.closed should return true if it is closing:

• ​https://html.spec.whatwg.org/#dom-window-closed

Window.close() sets the 'is closing' flag to true synchronously, as per:

• ​https://html.spec.whatwg.org/#dom-window-close (step 3.1)

No new tests, rebaselined existing tests.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::closed const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/browsers/the-window-object/close-method.window-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/browsers/the-window-object/closed-attribute.window-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/browsers/the-window-object/self-et-al.window-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2019-03-29  Chris Dumez  <cdumez@apple.com>
+
+        Set window.closed immediately when close() is invoked
+        https://bugs.webkit.org/show_bug.cgi?id=195409
+
+        Reviewed by Alex Christensen.
+
+        Rebaseline WPT tests now that more checks are passing.
+
+        * web-platform-tests/html/browsers/the-window-object/close-method.window-expected.txt:
+        * web-platform-tests/html/browsers/the-window-object/closed-attribute.window-expected.txt:
+
 2019-03-29  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/the-window-object/close-method.window-expected.txt

@@ -1 +1 @@
 
-FAIL window.close() queues a task to discard, but window.closed knows immediately assert_equals: expected true but got false
-FAIL window.close() affects name targeting immediately assert_equals: expected true but got false
+PASS window.close() queues a task to discard, but window.closed knows immediately 
+PASS window.close() affects name targeting immediately 
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/the-window-object/closed-attribute.window-expected.txt

@@ -3 +3 @@
 
 PASS closed and same-origin nested browsing context 
-FAIL closed/close() and same-origin auxiliary browsing context assert_equals: expected true but got false
+PASS closed/close() and same-origin auxiliary browsing context 
 TIMEOUT closed and cross-origin nested browsing context Test timed out
 TIMEOUT closed/close() and cross-origin auxiliary browsing context Test timed out

trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/the-window-object/self-et-al.window-expected.txt

@@ -1 +1 @@
 
 FAIL iframeWindow.frames before and after removal assert_equals: frames got cleared after browsing context removal expected object "[object Window]" but got null
-FAIL popupWindow.frames before, after closing, and after discarding assert_true: expected true got false
+FAIL popupWindow.frames before, after closing, and after discarding assert_equals: frames got cleared after browsing context removal expected object "[object Window]" but got null
 PASS iframeWindow.globalThis before and after removal 
-FAIL popupWindow.globalThis before, after closing, and after discarding assert_true: expected true got false
+PASS popupWindow.globalThis before, after closing, and after discarding 
 FAIL iframeWindow.self before and after removal assert_equals: self got cleared after browsing context removal expected object "[object Window]" but got null
-FAIL popupWindow.self before, after closing, and after discarding assert_true: expected true got false
+FAIL popupWindow.self before, after closing, and after discarding assert_equals: self got cleared after browsing context removal expected object "[object Window]" but got null
 FAIL iframeWindow.window before and after removal assert_equals: window got cleared after browsing context removal expected object "[object Window]" but got null
-FAIL popupWindow.window before, after closing, and after discarding assert_true: expected true got false
+FAIL popupWindow.window before, after closing, and after discarding assert_equals: window got cleared after browsing context removal expected object "[object Window]" but got null
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-29  Chris Dumez  <cdumez@apple.com>
+
+        Set window.closed immediately when close() is invoked
+        https://bugs.webkit.org/show_bug.cgi?id=195409
+
+        Reviewed by Alex Christensen.
+
+        Window.closed should return true if it is closing:
+        - https://html.spec.whatwg.org/#dom-window-closed
+
+        Window.close() sets the 'is closing' flag to true synchronously, as per:
+        - https://html.spec.whatwg.org/#dom-window-close (step 3.1)
+
+        No new tests, rebaselined existing tests.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::closed const):
+
 2019-03-29  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1315 +1315 @@
 bool DOMWindow::closed() const
 {
-    return !frame();
+    auto* frame = this->frame();
+    if (!frame)
+        return true;
+
+    auto* page = frame->page();
+    return !page || page->isClosing();
 }