Changeset 214771 in webkit

Timestamp:

Apr 3, 2017 5:01:58 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214194 - Prevent new navigations from onbeforeunload handler
​https://bugs.webkit.org/show_bug.cgi?id=169891
<rdar://problem/31155736>

Reviewed by Ryosuke Niwa.

Source/WebCore:

Ensure that all navigations initiated from an onbeforeunload handler are disallowed
regardless of how they were scheduled. Such navigations go against the expectation
of a user.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::isNavigationAllowed): Added.
(WebCore::FrameLoader::loadURL): Modified code to call FrameLoader::isNavigationAllowed().
(WebCore::FrameLoader::loadWithDocumentLoader): Ditto.
(WebCore::FrameLoader::stopAllLoaders): Ditto.

• loader/FrameLoader.h:

LayoutTests:

Update test to ensure that we disallow navigation initiated via a DOM click event from
an onbeforeunload handler.

• fast/events/before-unload-forbidden-navigation.html:

Location:

releases/WebKitGTK/webkit-2.16

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/before-unload-forbidden-navigation.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (4 diffs)
• Source/WebCore/loader/FrameLoader.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-20  Daniel Bates  <dabates@apple.com>
+
+        Prevent new navigations from onbeforeunload handler
+        https://bugs.webkit.org/show_bug.cgi?id=169891
+        <rdar://problem/31155736>
+
+        Reviewed by Ryosuke Niwa.
+
+        Update test to ensure that we disallow navigation initiated via a DOM click event from
+        an onbeforeunload handler.
+
+        * fast/events/before-unload-forbidden-navigation.html:
+
 2017-03-19  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.16/LayoutTests/fast/events/before-unload-forbidden-navigation.html

@@ -13 +13 @@
 
 var log = document.getElementById('log');
+var didFireBeforeUnloadEvent = false;
 
 function test(iframe) {
@@ -26 +27 @@
 }
 
+function navigateByClickingHyperlink(contentWindow, url) {
+    var link = contentWindow.document.createElement('a');
+    link.href = url;
+    link.click();
+}
+
 function fired(contentWindow) {
+    if (didFireBeforeUnloadEvent)
+        return;
+    didFireBeforeUnloadEvent = true;
+
     location.href = 'resources/before-unload-in-subframe-fail.html';
     contentWindow.location.href = 'resources/before-unload-in-subframe-fail.html';
+    navigateByClickingHyperlink(contentWindow, 'resources/before-unload-in-subframe-fail.html');
+    navigateByClickingHyperlink(window, 'resources/before-unload-in-subframe-fail.html');
+
     log.innerHTML = 'PASS 1/2';
     contentWindow.frameElement.halfPassed = true;

releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-20  Daniel Bates  <dabates@apple.com>
+
+        Prevent new navigations from onbeforeunload handler
+        https://bugs.webkit.org/show_bug.cgi?id=169891
+        <rdar://problem/31155736>
+
+        Reviewed by Ryosuke Niwa.
+
+        Ensure that all navigations initiated from an onbeforeunload handler are disallowed
+        regardless of how they were scheduled. Such navigations go against the expectation
+        of a user.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::isNavigationAllowed): Added.
+        (WebCore::FrameLoader::loadURL): Modified code to call FrameLoader::isNavigationAllowed().
+        (WebCore::FrameLoader::loadWithDocumentLoader): Ditto.
+        (WebCore::FrameLoader::stopAllLoaders): Ditto.
+        * loader/FrameLoader.h:
+
 2017-03-20  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.cpp

@@ -1186 +1186 @@
 }
 
+bool FrameLoader::isNavigationAllowed() const
+{
+    return m_pageDismissalEventBeingDispatched == PageDismissalType::None && NavigationDisablerForBeforeUnload::isNavigationAllowed();
+}
+
 void FrameLoader::loadURL(const FrameLoadRequest& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, Event* event, FormState* formState)
 {
@@ -1224 +1229 @@
     }
 
-    if (m_pageDismissalEventBeingDispatched != PageDismissalType::None)
+    if (!isNavigationAllowed())
         return;
 
@@ -1426 +1431 @@
     ASSERT(m_frame.view());
 
-    if (m_pageDismissalEventBeingDispatched != PageDismissalType::None)
+    if (!isNavigationAllowed())
         return;
 
@@ -1613 +1618 @@
 {
     ASSERT(!m_frame.document() || m_frame.document()->pageCacheState() != Document::InPageCache);
-    if (m_pageDismissalEventBeingDispatched != PageDismissalType::None)
+    if (!isNavigationAllowed())
         return;
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.h

@@ -387 +387 @@
     void applyShouldOpenExternalURLsPolicyToNewDocumentLoader(DocumentLoader&, ShouldOpenExternalURLsPolicy propagatedPolicy);
 
+    bool isNavigationAllowed() const;
+
     Frame& m_frame;
     FrameLoaderClient& m_client;