<!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>[207599] branches/safari-602-branch/Source</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/207599">207599</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 02:59:31 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206132">r206132</a>. rdar://problem/28634856</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoaderh">branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoaderStateMachineh">branches/safari-602-branch/Source/WebCore/loader/FrameLoaderStateMachine.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207598 => 207599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 09:59:27 UTC (rev 207598)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 09:59:31 UTC (rev 207599)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206132. rdar://problem/28634856
+
+ 2016-09-19 Anders Carlsson <andersca@apple.com>
+
+ Suppress JavaScript prompts early on in certain cases
+ https://bugs.webkit.org/show_bug.cgi?id=162243
+ rdar://problem/27661602
+
+ Reviewed by Geoffrey Garen.
+
+ Export symbols needed by WebKit2.
+
+ * loader/FrameLoader.h:
+ * loader/FrameLoaderStateMachine.h:
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r205326. rdar://problem/28476952
</span><span class="cx">
</span><span class="cx"> 2016-09-01 Ricky Mondello <rmondello@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h (207598 => 207599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h 2016-10-20 09:59:27 UTC (rev 207598)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h 2016-10-20 09:59:31 UTC (rev 207599)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> bool checkIfFormActionAllowedByCSP(const URL&, bool didReceiveRedirectResponse) const;
</span><span class="cx">
</span><del>- Frame* opener();
</del><ins>+ WEBCORE_EXPORT Frame* opener();
</ins><span class="cx"> WEBCORE_EXPORT void setOpener(Frame*);
</span><span class="cx">
</span><span class="cx"> void resetMultipleFormSubmissionProtection();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoaderStateMachineh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoaderStateMachine.h (207598 => 207599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/FrameLoaderStateMachine.h 2016-10-20 09:59:27 UTC (rev 207598)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoaderStateMachine.h 2016-10-20 09:59:31 UTC (rev 207599)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool committingFirstRealLoad() const;
</span><span class="cx"> bool committedFirstRealDocumentLoad() const;
</span><span class="cx"> bool creatingInitialEmptyDocument() const;
</span><del>- bool isDisplayingInitialEmptyDocument() const;
</del><ins>+ WEBCORE_EXPORT bool isDisplayingInitialEmptyDocument() const;
</ins><span class="cx"> WEBCORE_EXPORT bool firstLayoutDone() const;
</span><span class="cx"> void advanceTo(State);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207598 => 207599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 09:59:27 UTC (rev 207598)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 09:59:31 UTC (rev 207599)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r206132. rdar://problem/28634856
+
+ 2016-09-19 Anders Carlsson <andersca@apple.com>
+
+ Suppress JavaScript prompts early on in certain cases
+ https://bugs.webkit.org/show_bug.cgi?id=162243
+ rdar://problem/27661602
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::shouldSuppressJavaScriptDialogs):
+ Add helper function.
+
+ (WebKit::WebChromeClient::runJavaScriptAlert):
+ (WebKit::WebChromeClient::runJavaScriptConfirm):
+ (WebKit::WebChromeClient::runJavaScriptPrompt):
+ Call helper function and return early if we should supress dialogs.
+
</ins><span class="cx"> 2016-09-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206527. rdar://problem/28499358
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (207598 => 207599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-10-20 09:59:27 UTC (rev 207598)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-10-20 09:59:31 UTC (rev 207599)
</span><span class="lines">@@ -379,8 +379,19 @@
</span><span class="cx"> m_page->sendClose();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldSuppressJavaScriptDialogs(Frame& frame)
+{
+ if (frame.loader().opener() && frame.loader().stateMachine().isDisplayingInitialEmptyDocument() && frame.loader().provisionalDocumentLoader())
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> void WebChromeClient::runJavaScriptAlert(Frame* frame, const String& alertText)
</span><span class="cx"> {
</span><ins>+ if (shouldSuppressJavaScriptDialogs(*frame))
+ return;
+
</ins><span class="cx"> WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span><span class="lines">@@ -394,6 +405,9 @@
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
</span><span class="cx"> {
</span><ins>+ if (shouldSuppressJavaScriptDialogs(*frame))
+ return false;
+
</ins><span class="cx"> WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span><span class="lines">@@ -411,6 +425,9 @@
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
</span><span class="cx"> {
</span><ins>+ if (shouldSuppressJavaScriptDialogs(*frame))
+ return false;
+
</ins><span class="cx"> WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
</span><span class="cx"> ASSERT(webFrame);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>