<!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>[187176] branches/safari-600.8-branch</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/187176">187176</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 13:36:53 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/185915">r185915</a>. rdar://problem/21716368</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6008branchSourceWebKit2ChangeLog">branches/safari-600.8-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebKit2SharedAPIcWKSharedAPICasth">branches/safari-600.8-branch/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#branchessafari6008branchSourceWebKit2UIProcessAPICWKPagecpp">branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#branchessafari6008branchSourceWebKit2UIProcessAPICWKPageUIClienth">branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#branchessafari6008branchSourceWebKit2UIProcesseflPageUIClientEflcpp">branches/safari-600.8-branch/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp</a></li>
<li><a href="#branchessafari6008branchToolsChangeLog">branches/safari-600.8-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6008branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">branches/safari-600.8-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6008branchToolsTestWebKitAPITestsWebKit2CloseFromWithinCreatePagecpp">branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp</a></li>
<li><a href="#branchessafari6008branchToolsTestWebKitAPITestsWebKit2DocumentStartUserScriptAlertCrashcpp">branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp</a></li>
<li><a href="#branchessafari6008branchToolsTestWebKitAPITestsmacPageVisibilityStateWithWindowChangesmm">branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm</a></li>
<li><a href="#branchessafari6008branchToolsWebKitTestRunnerTestControllercpp">branches/safari-600.8-branch/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6008branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-21 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r185915. rdar://problem/21716368
+
+ 2015-06-24 Brady Eidson <beidson@apple.com>
+
+ Update JavaScript dialog delegates to include a WKSecurityOriginRef argument.
+ <rdar://problem/21269187> and https://bugs.webkit.org/show_bug.cgi?id=146249
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient): Call the new signature if the client has it set.
+ Otherwise fall back to the old signature.
+ * UIProcess/API/C/WKPageUIClient.h: Deprecate the old method signature, and add the new
+ one to the newest V5 client structure.
+
</ins><span class="cx"> 2015-07-21 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186812
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "WKPageLoadTypes.h"
</span><span class="cx"> #include "WKPageLoadTypesPrivate.h"
</span><span class="cx"> #include "WKPageVisibilityTypes.h"
</span><ins>+#include "WKSecurityOrigin.h"
</ins><span class="cx"> #include "WKUserContentInjectedFrames.h"
</span><span class="cx"> #include "WKUserScriptInjectionTime.h"
</span><span class="cx"> #include "WebEvent.h"
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PluginInformation.h"
</span><span class="cx"> #include "PrintInfo.h"
</span><ins>+#include "SecurityOriginData.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKPagePolicyClientInternal.h"
</span><span class="cx"> #include "WKPluginInformation.h"
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKPageUIClientBase> {
</span><del>- typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3> Versions;
</del><ins>+ typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3, WKPageUIClientV4> Versions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1254,34 +1255,51 @@
</span><span class="cx">
</span><span class="cx"> virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler) override
</span><span class="cx"> {
</span><del>- if (!m_client.runJavaScriptAlert) {
</del><ins>+ if (!m_client.runJavaScriptAlert && !m_client.runJavaScriptAlert_deprecatedForUseWithV0) {
</ins><span class="cx"> completionHandler();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_client.runJavaScriptAlert(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ if (m_client.runJavaScriptAlert) {
+ RefPtr<WebSecurityOrigin> securityOrigin = WebSecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
+ m_client.runJavaScriptAlert(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo);
+ } else
+ m_client.runJavaScriptAlert_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
+
</ins><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler) override
</span><span class="cx"> {
</span><del>- if (!m_client.runJavaScriptConfirm) {
</del><ins>+ if (!m_client.runJavaScriptConfirm && !m_client.runJavaScriptConfirm_deprecatedForUseWithV0) {
</ins><span class="cx"> completionHandler(false);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool result = m_client.runJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ bool result;
+ if (m_client.runJavaScriptConfirm) {
+ RefPtr<WebSecurityOrigin> securityOrigin = WebSecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
+ result = m_client.runJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo);
+ } else
+ result = m_client.runJavaScriptConfirm_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
+
</ins><span class="cx"> completionHandler(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void (const String&)> completionHandler) override
</span><span class="cx"> {
</span><del>- if (!m_client.runJavaScriptPrompt) {
</del><ins>+ if (!m_client.runJavaScriptPrompt && !m_client.runJavaScriptPrompt_deprecatedForUseWithV0) {
</ins><span class="cx"> completionHandler(String());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::String> string = adoptRef(toImpl(m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo)));
</del><ins>+ RefPtr<API::String> string;
+ if (m_client.runJavaScriptPrompt) {
+ RefPtr<WebSecurityOrigin> securityOrigin = WebSecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
+ string = adoptRef(toImpl(m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo)));
+ } else
+ string = adoptRef(toImpl(m_client.runJavaScriptPrompt_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo)));
+
</ins><span class="cx"> if (!string) {
</span><span class="cx"> completionHandler(String());
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx">
</span><span class="cx"> typedef void (*WKPageUIClientCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKURLRequestRef urlRequest, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
</span><del>-typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void *clientInfo);
-typedef bool (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, const void *clientInfo);
-typedef WKStringRef (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, const void *clientInfo);
</del><ins>+typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
+typedef bool (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
+typedef WKStringRef (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
</ins><span class="cx"> typedef void (*WKPageTakeFocusCallback)(WKPageRef page, WKFocusDirection direction, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageFocusCallback)(WKPageRef page, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageUnfocusCallback)(WKPageRef page, const void *clientInfo);
</span><span class="lines">@@ -92,6 +92,9 @@
</span><span class="cx"> typedef void (*WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0)(WKPageRef page, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo);
</span><ins>+typedef void (*WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void *clientInfo);
+typedef bool (*WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef message, WKFrameRef frame, const void *clientInfo);
+typedef WKStringRef (*WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, const void *clientInfo);
</ins><span class="cx">
</span><span class="cx"> typedef struct WKPageUIClientBase {
</span><span class="cx"> int version;
</span><span class="lines">@@ -108,9 +111,9 @@
</span><span class="cx"> WKPageTakeFocusCallback takeFocus;
</span><span class="cx"> WKPageFocusCallback focus;
</span><span class="cx"> WKPageUnfocusCallback unfocus;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
</ins><span class="cx"> WKPageSetStatusTextCallback setStatusText;
</span><span class="cx"> WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
</span><span class="cx"> WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
</span><span class="lines">@@ -153,9 +156,9 @@
</span><span class="cx"> WKPageTakeFocusCallback takeFocus;
</span><span class="cx"> WKPageFocusCallback focus;
</span><span class="cx"> WKPageUnfocusCallback unfocus;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
</ins><span class="cx"> WKPageSetStatusTextCallback setStatusText;
</span><span class="cx"> WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
</span><span class="cx"> WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
</span><span class="lines">@@ -204,9 +207,9 @@
</span><span class="cx"> WKPageTakeFocusCallback takeFocus;
</span><span class="cx"> WKPageFocusCallback focus;
</span><span class="cx"> WKPageUnfocusCallback unfocus;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
</ins><span class="cx"> WKPageSetStatusTextCallback setStatusText;
</span><span class="cx"> WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
</span><span class="cx"> WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
</span><span class="lines">@@ -260,9 +263,9 @@
</span><span class="cx"> WKPageTakeFocusCallback takeFocus;
</span><span class="cx"> WKPageFocusCallback focus;
</span><span class="cx"> WKPageUnfocusCallback unfocus;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
</ins><span class="cx"> WKPageSetStatusTextCallback setStatusText;
</span><span class="cx"> WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
</span><span class="cx"> WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
</span><span class="lines">@@ -309,6 +312,72 @@
</span><span class="cx"> WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
</span><span class="cx"> } WKPageUIClientV3;
</span><span class="cx">
</span><ins>+typedef struct WKPageUIClientV4 {
+ WKPageUIClientBase base;
+
+ // Version 0.
+ WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0;
+ WKPageUIClientCallback showPage;
+ WKPageUIClientCallback close;
+ WKPageTakeFocusCallback takeFocus;
+ WKPageFocusCallback focus;
+ WKPageUnfocusCallback unfocus;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageSetStatusTextCallback setStatusText;
+ WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
+ WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
+ WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent;
+ WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent;
+ WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible;
+ WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible;
+ WKPageGetMenuBarIsVisibleCallback menuBarIsVisible;
+ WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible;
+ WKPageGetStatusBarIsVisibleCallback statusBarIsVisible;
+ WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible;
+ WKPageGetIsResizableCallback isResizable;
+ WKPageSetIsResizableCallback setIsResizable;
+ WKPageGetWindowFrameCallback getWindowFrame;
+ WKPageSetWindowFrameCallback setWindowFrame;
+ WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
+ WKPageUIClientCallback didDraw;
+ WKPageUIClientCallback pageDidScroll;
+ WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
+ WKPageRunOpenPanelCallback runOpenPanel;
+ WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest;
+ WKPageHeaderHeightCallback headerHeight;
+ WKPageFooterHeightCallback footerHeight;
+ WKPageDrawHeaderCallback drawHeader;
+ WKPageDrawFooterCallback drawFooter;
+ WKPagePrintFrameCallback printFrame;
+ WKPageUIClientCallback runModal;
+ void* unused1; // Used to be didCompleteRubberBandForMainFrame
+ WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
+ WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+
+ // Version 1.
+ WKPageCreateNewPageCallback createNewPage;
+ WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
+ WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
+ WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
+
+ // Version 2.
+ WKPageShowColorPickerCallback showColorPicker;
+ WKPageHideColorPickerCallback hideColorPicker;
+ WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
+
+ // Version 3.
+ WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
+
+ // Version 4.
+ WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
+
+} WKPageUIClientV4;
+
+
</ins><span class="cx"> enum { kWKPageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
</span><span class="cx"> typedef struct WKPageUIClient {
</span><span class="cx"> int version;
</span><span class="lines">@@ -321,9 +390,9 @@
</span><span class="cx"> WKPageTakeFocusCallback takeFocus;
</span><span class="cx"> WKPageFocusCallback focus;
</span><span class="cx"> WKPageUnfocusCallback unfocus;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
</ins><span class="cx"> WKPageSetStatusTextCallback setStatusText;
</span><span class="cx"> WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
</span><span class="cx"> WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebKit2UIProcesseflPageUIClientEflcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -60,9 +60,9 @@
</span><span class="cx"> uiClient.takeFocus = takeFocus;
</span><span class="cx"> uiClient.focus = focus;
</span><span class="cx"> uiClient.unfocus = unfocus;
</span><del>- uiClient.runJavaScriptAlert = runJavaScriptAlert;
- uiClient.runJavaScriptConfirm = runJavaScriptConfirm;
- uiClient.runJavaScriptPrompt = runJavaScriptPrompt;
</del><ins>+ uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert;
+ uiClient.runJavaScriptConfirm_deprecatedForUseWithV0 = runJavaScriptConfirm;
+ uiClient.runJavaScriptPrompt_deprecatedForUseWithV0 = runJavaScriptPrompt;
</ins><span class="cx"> uiClient.toolbarsAreVisible = toolbarsAreVisible;
</span><span class="cx"> uiClient.setToolbarsAreVisible = setToolbarsAreVisible;
</span><span class="cx"> uiClient.menuBarIsVisible = menuBarIsVisible;
</span></span></pre></div>
<a id="branchessafari6008branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Tools/ChangeLog (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Tools/ChangeLog 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Tools/ChangeLog 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-07-21 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r185915. rdar://problem/21716368
+
+ 2015-06-24 Brady Eidson <beidson@apple.com>
+
+ Update JavaScript dialog delegates to include a WKSecurityOriginRef argument.
+ <rdar://problem/21269187> and https://bugs.webkit.org/show_bug.cgi?id=146249
+
+ Reviewed by Alex Christensen.
+
+ - Update WKTR to the new client structure.
+ - Update existing TestWebKitAPI tests to either use the new client structure or
+ assign the old function signature to the updated variable name.
+ - Include a new test.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+
+ * TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp:
+ (TestWebKitAPI::runJavaScriptAlert):
+
+ * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
+ (TestWebKitAPI::TEST):
+
+ * TestWebKitAPI/Tests/WebKit2/ModalAlertsSPI.cpp:
+ (TestWebKitAPI::analyzeDialogArguments):
+ (TestWebKitAPI::runJavaScriptAlert):
+ (TestWebKitAPI::runJavaScriptConfirm):
+ (TestWebKitAPI::runJavaScriptPrompt):
+ (TestWebKitAPI::createNewPage):
+ (TestWebKitAPI::TEST):
+
+ * TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
+ (TestWebKitAPI::FullscreenZoomInitialFrame::initializeView):
+
+ * TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
+ (TestWebKitAPI::PageVisibilityStateWithWindowChanges::initializeView):
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2015-07-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186763. rdar://problem/21707917
</span></span></pre></div>
<a id="branchessafari6008branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> 5142B2731517C8C800C32B19 /* ContextMenuCanCopyURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */; };
</span><span class="cx"> 517E7DFC15110EA600D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517E7DFB15110EA600D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.mm */; };
</span><span class="cx"> 517E7E04151119C100D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 517E7E031511187500D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.html */; };
</span><ins>+ 51CB4AD81B3A079C00C1B1C6 /* ModalAlertsSPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CB4AD71B3A079C00C1B1C6 /* ModalAlertsSPI.cpp */; };
</ins><span class="cx"> 51E5C7021919C3B200D8B3E1 /* simple2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51E780361919AFF8001829A2 /* simple2.html */; };
</span><span class="cx"> 51E5C7031919C3B200D8B3E1 /* simple3.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51E780371919AFF8001829A2 /* simple3.html */; };
</span><span class="cx"> 51E5C7051919EA5F00D8B3E1 /* ShouldKeepCurrentBackForwardListItemInList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E5C7041919EA5F00D8B3E1 /* ShouldKeepCurrentBackForwardListItemInList.cpp */; };
</span><span class="lines">@@ -445,6 +446,7 @@
</span><span class="cx"> 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ContextMenuCanCopyURL.html; sourceTree = "<group>"; };
</span><span class="cx"> 517E7DFB15110EA600D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryCachePruneWithinResourceLoadDelegate.mm; sourceTree = "<group>"; };
</span><span class="cx"> 517E7E031511187500D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = MemoryCachePruneWithinResourceLoadDelegate.html; sourceTree = "<group>"; };
</span><ins>+ 51CB4AD71B3A079C00C1B1C6 /* ModalAlertsSPI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModalAlertsSPI.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 51E5C7041919EA5F00D8B3E1 /* ShouldKeepCurrentBackForwardListItemInList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShouldKeepCurrentBackForwardListItemInList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51E780361919AFF8001829A2 /* simple2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = simple2.html; sourceTree = "<group>"; };
</span><span class="cx"> 51E780371919AFF8001829A2 /* simple3.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = simple3.html; sourceTree = "<group>"; };
</span><span class="lines">@@ -846,6 +848,7 @@
</span><span class="cx"> 33DC8910141953A300747EF7 /* LoadCanceledNoServerRedirectCallback.cpp */,
</span><span class="cx"> 33DC89131419579F00747EF7 /* LoadCanceledNoServerRedirectCallback_Bundle.cpp */,
</span><span class="cx"> 8AA28C1916D2FA7B002FF4DB /* LoadPageOnCrash.cpp */,
</span><ins>+ 51CB4AD71B3A079C00C1B1C6 /* ModalAlertsSPI.cpp */,
</ins><span class="cx"> 33BE5AF4137B5A6C00705813 /* MouseMoveAfterCrash.cpp */,
</span><span class="cx"> 33BE5AF8137B5AAE00705813 /* MouseMoveAfterCrash_Bundle.cpp */,
</span><span class="cx"> 93F1DB3014DA20760024C362 /* NewFirstVisuallyNonEmptyLayout.cpp */,
</span><span class="lines">@@ -1380,6 +1383,7 @@
</span><span class="cx"> 265AF55015D1E48A00B0CB4A /* WTFString.cpp in Sources */,
</span><span class="cx"> 2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */,
</span><span class="cx"> 2E7765CF16C4D81100BA2BB1 /* mainMac.mm in Sources */,
</span><ins>+ 51CB4AD81B3A079C00C1B1C6 /* ModalAlertsSPI.cpp in Sources */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6008branchToolsTestWebKitAPITestsWebKit2CloseFromWithinCreatePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> static bool testDone;
</span><span class="cx"> static std::unique_ptr<PlatformWebView> openedWebView;
</span><span class="cx">
</span><del>-static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
</del><ins>+static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Check that the alert text matches the storage.
</span><span class="cx"> testDone = true;
</span><span class="lines">@@ -44,10 +44,10 @@
</span><span class="cx">
</span><span class="cx"> openedWebView = std::make_unique<PlatformWebView>(page);
</span><span class="cx">
</span><del>- WKPageUIClientV1 uiClient;
</del><ins>+ WKPageUIClientV4 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx">
</span><del>- uiClient.base.version = 5;
</del><ins>+ uiClient.base.version = 4;
</ins><span class="cx"> uiClient.runJavaScriptAlert = runJavaScriptAlert;
</span><span class="cx"> WKPageSetPageUIClient(openedWebView->page(), &uiClient.base);
</span><span class="cx">
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageUIClientV1 uiClient;
</del><ins>+ WKPageUIClientV4 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx">
</span><del>- uiClient.base.version = 5;
</del><ins>+ uiClient.base.version = 4;
</ins><span class="cx"> uiClient.createNewPage = createNewPage;
</span><span class="cx"> uiClient.runJavaScriptAlert = runJavaScriptAlert;
</span><span class="cx"> WKPageSetPageUIClient(webView.page(), &uiClient.base);
</span></span></pre></div>
<a id="branchessafari6008branchToolsTestWebKitAPITestsWebKit2DocumentStartUserScriptAlertCrashcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> static bool done;
</span><span class="cx">
</span><del>-static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
</del><ins>+static void runJavaScriptAlert_deprecatedForUseWithV0(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_NULL(frame);
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx">
</span><span class="cx"> uiClient.base.version = 0;
</span><del>- uiClient.runJavaScriptAlert = runJavaScriptAlert;
</del><ins>+ uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
</ins><span class="cx">
</span><span class="cx"> WKPageSetPageUIClient(webView.page(), &uiClient.base);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6008branchToolsTestWebKitAPITestsmacPageVisibilityStateWithWindowChangesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> // WebKit2 WKPageUIClient
</span><span class="cx">
</span><del>-static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
</del><ins>+static void runJavaScriptAlert_deprecatedForUseWithV0(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx"> EXPECT_TRUE(isWaitingForPageSignalToContinue);
</span><span class="cx"> isWaitingForPageSignalToContinue = false;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx">
</span><span class="cx"> uiClient.base.version = 0;
</span><del>- uiClient.runJavaScriptAlert = runJavaScriptAlert;
</del><ins>+ uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
</ins><span class="cx">
</span><span class="cx"> WKPageSetPageUIClient(wkView.pageRef, &uiClient.base);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6008branchToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Tools/WebKitTestRunner/TestController.cpp (187175 => 187176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Tools/WebKitTestRunner/TestController.cpp 2015-07-22 20:31:07 UTC (rev 187175)
+++ branches/safari-600.8-branch/Tools/WebKitTestRunner/TestController.cpp 2015-07-22 20:36:53 UTC (rev 187176)
</span><span class="lines">@@ -220,9 +220,9 @@
</span><span class="cx"> 0, // takeFocus
</span><span class="cx"> focus,
</span><span class="cx"> unfocus,
</span><del>- 0, // runJavaScriptAlert
- 0, // runJavaScriptConfirm
- 0, // runJavaScriptPrompt
</del><ins>+ 0, // runJavaScriptAlert_deprecatedForUseWithV0
+ 0, // runJavaScriptAlert_deprecatedForUseWithV0
+ 0, // runJavaScriptAlert_deprecatedForUseWithV0
</ins><span class="cx"> 0, // setStatusText
</span><span class="cx"> 0, // mouseDidMoveOverElement_deprecatedForUseWithV0
</span><span class="cx"> 0, // missingPluginButtonClicked
</span><span class="lines">@@ -426,9 +426,9 @@
</span><span class="cx"> 0, // takeFocus
</span><span class="cx"> focus,
</span><span class="cx"> unfocus,
</span><del>- 0, // runJavaScriptAlert
- 0, // runJavaScriptConfirm
- 0, // runJavaScriptPrompt
</del><ins>+ 0, // runJavaScriptAlert_deprecatedForUseWithV0
+ 0, // runJavaScriptAlert_deprecatedForUseWithV0
+ 0, // runJavaScriptAlert_deprecatedForUseWithV0
</ins><span class="cx"> 0, // setStatusText
</span><span class="cx"> 0, // mouseDidMoveOverElement_deprecatedForUseWithV0
</span><span class="cx"> 0, // missingPluginButtonClicked
</span></span></pre>
</div>
</div>
</body>
</html>