<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214771] releases/WebKitGTK/webkit-2.16</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214771">214771</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-03 05:01:58 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214194">r214194</a> - 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfasteventsbeforeunloadforbiddennavigationhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/events/before-unload-forbidden-navigation.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreloaderFrameLoadercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreloaderFrameLoaderh">releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (214770 => 214771)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-03 11:25:05 UTC (rev 214770)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-03 12:01:58 UTC (rev 214771)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-03-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> `const location = "foo"` throws in a worker
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfasteventsbeforeunloadforbiddennavigationhtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/events/before-unload-forbidden-navigation.html (214770 => 214771)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/events/before-unload-forbidden-navigation.html 2017-04-03 11:25:05 UTC (rev 214770)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/events/before-unload-forbidden-navigation.html 2017-04-03 12:01:58 UTC (rev 214771)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var log = document.getElementById('log');
</span><ins>+var didFireBeforeUnloadEvent = false;
</ins><span class="cx">
</span><span class="cx"> function test(iframe) {
</span><span class="cx"> if (iframe.done) {
</span><span class="lines">@@ -25,9 +26,22 @@
</span><span class="cx"> iframe.contentWindow.location.href = 'resources/before-unload-in-subframe-child.html';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function navigateByClickingHyperlink(contentWindow, url) {
+ var link = contentWindow.document.createElement('a');
+ link.href = url;
+ link.click();
+}
+
</ins><span class="cx"> function fired(contentWindow) {
</span><ins>+ if (didFireBeforeUnloadEvent)
+ return;
+ didFireBeforeUnloadEvent = true;
+
</ins><span class="cx"> location.href = 'resources/before-unload-in-subframe-fail.html';
</span><span class="cx"> contentWindow.location.href = 'resources/before-unload-in-subframe-fail.html';
</span><ins>+ navigateByClickingHyperlink(contentWindow, 'resources/before-unload-in-subframe-fail.html');
+ navigateByClickingHyperlink(window, 'resources/before-unload-in-subframe-fail.html');
+
</ins><span class="cx"> log.innerHTML = 'PASS 1/2';
</span><span class="cx"> contentWindow.frameElement.halfPassed = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214770 => 214771)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 11:25:05 UTC (rev 214770)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 12:01:58 UTC (rev 214771)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-03-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Move code out of renderer destructors into willBeDestroyed()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.cpp (214770 => 214771)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.cpp 2017-04-03 11:25:05 UTC (rev 214770)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.cpp 2017-04-03 12:01:58 UTC (rev 214771)
</span><span class="lines">@@ -1185,6 +1185,11 @@
</span><span class="cx"> return propagatedPolicy;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool FrameLoader::isNavigationAllowed() const
+{
+ return m_pageDismissalEventBeingDispatched == PageDismissalType::None && NavigationDisablerForBeforeUnload::isNavigationAllowed();
+}
+
</ins><span class="cx"> void FrameLoader::loadURL(const FrameLoadRequest& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, Event* event, FormState* formState)
</span><span class="cx"> {
</span><span class="cx"> if (m_inStopAllLoaders)
</span><span class="lines">@@ -1223,7 +1228,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_pageDismissalEventBeingDispatched != PageDismissalType::None)
</del><ins>+ if (!isNavigationAllowed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NavigationAction action(request, newLoadType, isFormSubmission, event, frameLoadRequest.shouldOpenExternalURLsPolicy(), frameLoadRequest.downloadAttribute());
</span><span class="lines">@@ -1425,7 +1430,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_frame.view());
</span><span class="cx">
</span><del>- if (m_pageDismissalEventBeingDispatched != PageDismissalType::None)
</del><ins>+ if (!isNavigationAllowed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_frame.document())
</span><span class="lines">@@ -1612,7 +1617,7 @@
</span><span class="cx"> void FrameLoader::stopAllLoaders(ClearProvisionalItemPolicy clearProvisionalItemPolicy)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_frame.document() || m_frame.document()->pageCacheState() != Document::InPageCache);
</span><del>- if (m_pageDismissalEventBeingDispatched != PageDismissalType::None)
</del><ins>+ if (!isNavigationAllowed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If this method is called from within this method, infinite recursion can occur (3442218). Avoid this.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.h (214770 => 214771)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.h 2017-04-03 11:25:05 UTC (rev 214770)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/loader/FrameLoader.h 2017-04-03 12:01:58 UTC (rev 214771)
</span><span class="lines">@@ -386,6 +386,8 @@
</span><span class="cx">
</span><span class="cx"> void applyShouldOpenExternalURLsPolicyToNewDocumentLoader(DocumentLoader&, ShouldOpenExternalURLsPolicy propagatedPolicy);
</span><span class="cx">
</span><ins>+ bool isNavigationAllowed() const;
+
</ins><span class="cx"> Frame& m_frame;
</span><span class="cx"> FrameLoaderClient& m_client;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>