Changeset 270560 in webkit

Timestamp:

Dec 8, 2020 3:54:12 PM (3 years ago)

Author:

Chris Dumez

Message:

Unreviewed, reverting r269983.

Seems to have regressed PLT5

Reverted changeset:

"[iOS] beforeunload event does not fire in MobileSafari"
​https://bugs.webkit.org/show_bug.cgi?id=219102
​https://trac.webkit.org/changeset/269983

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/beforeunload.html (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ModalAlerts.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-08  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, reverting r269983.
+
+        Seems to have regressed PLT5
+
+        Reverted changeset:
+
+        "[iOS] beforeunload event does not fire in MobileSafari"
+        https://bugs.webkit.org/show_bug.cgi?id=219102
+        https://trac.webkit.org/changeset/269983
+
 2020-12-08  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -3235 +3235 @@
     if (!page)
         return true;
+    if (!page->chrome().canRunBeforeUnloadConfirmPanel())
+        return true;
 
     // Store all references to each subframe in advance since beforeunload's event handler may modify frame
@@ -3364 +3366 @@
         document->defaultEventHandler(beforeUnloadEvent.get());
 
-    if (!chrome.canRunBeforeUnloadConfirmPanel() || !shouldAskForNavigationConfirmation(*document, beforeUnloadEvent))
+    if (!shouldAskForNavigationConfirmation(*document, beforeUnloadEvent))
         return true;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-12-08  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, reverting r269983.
+
+        Seems to have regressed PLT5
+
+        Reverted changeset:
+
+        "[iOS] beforeunload event does not fire in MobileSafari"
+        https://bugs.webkit.org/show_bug.cgi?id=219102
+        https://trac.webkit.org/changeset/269983
+
 2020-12-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/beforeunload.html

@@ -4 +4 @@
 <script>
 onbeforeunload = (ev) => {
-    if (window.webkit && webkit.messageHandlers.testHandler)
-        webkit.messageHandlers.testHandler.postMessage("beforeunload called");
     ev.preventDefault();
     return "foo";

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ModalAlerts.mm

@@ -314 +314 @@
 
 #endif
-
-static bool wasBeforeUnloadEventHandlerCalled = false;
-
-@interface UIDelegateWithoutRunBeforeUnload : NSObject <WKUIDelegate>
-@end
-
-@implementation UIDelegateWithoutRunBeforeUnload
-
-- (void)webViewDidClose:(WKWebView *)webView
-{
-    [webView _close];
-}
-
-@end
-
-@interface BeforeUnloadMessageHandler : NSObject <WKScriptMessageHandler>
-@end
-
-@implementation BeforeUnloadMessageHandler
-- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
-{
-    NSString *scriptMessage = [message body];
-    EXPECT_WK_STREQ(@"beforeunload called", scriptMessage);
-    wasBeforeUnloadEventHandlerCalled = true;
-}
-@end
-
-TEST(WebKit, BeforeUnloadEventWithoutRunBeforeUnloadConfirmPanelUIDelegate)
-{
-    auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    auto messageHandler = adoptNS([[BeforeUnloadMessageHandler alloc] init]);
-    [[webViewConfiguration userContentController] addScriptMessageHandler:messageHandler.get() name:@"testHandler"];
-
-    auto uiDelegate = adoptNS([[UIDelegateWithoutRunBeforeUnload alloc] init]);
-    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
-    [webView setUIDelegate:uiDelegate.get()];
-
-    [webView synchronouslyLoadTestPageNamed:@"beforeunload"];
-
-    TestWebKitAPI::Util::spinRunLoop(10);
-
-    [webView _tryClose];
-
-    // The beforeunload event handler should get called even if the client application does not
-    // have a UIDelegate that can show the before unload prompt.
-    TestWebKitAPI::Util::run(&wasBeforeUnloadEventHandlerCalled);
-
-    // The view should get closed.
-    while (![webView _isClosed])
-        TestWebKitAPI::Util::sleep(0.1);
-}