<!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>[194078] branches/safari-601-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/194078">194078</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 16:35:39 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192911">r192911</a>. rdar://problem/23816165</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebKit2ChangeLog">branches/safari-601-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKit2SharedAPIAPIObjecth">branches/safari-601-branch/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2SharedAPIcWKBaseh">branches/safari-601-branch/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2UIProcessAPICWKPagecpp">branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebKit2UIProcessAPICWKPageUIClienth">branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#branchessafari601branchToolsChangeLog">branches/safari-601-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601branchToolsWebKitTestRunnerTestControllercpp">branches/safari-601-branch/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-12-08 Harris Papadopoulos <cpapadopoulos@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192911. rdar://problem/23816165
+
+ 2015-12-01 Sam Weinig <sam@webkit.org>
+
+ Need completionHandler-based WebKit C SPI for alert, confirm, and prompt
+ <rdar://problem/23320863>
+ https://bugs.webkit.org/show_bug.cgi?id=151708
+
+ Reviewed by Anders Carlsson.
+
+ Add listener based versions of alert, confirm and prompt.
+
+ * Shared/API/APIObject.h:
+ * Shared/API/c/WKBase.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WebKit::RunJavaScriptAlertResultListener::create):
+ (WebKit::RunJavaScriptAlertResultListener::~RunJavaScriptAlertResultListener):
+ (WebKit::RunJavaScriptAlertResultListener::call):
+ (WebKit::RunJavaScriptAlertResultListener::RunJavaScriptAlertResultListener):
+ (WebKit::RunJavaScriptConfirmResultListener::create):
+ (WebKit::RunJavaScriptConfirmResultListener::~RunJavaScriptConfirmResultListener):
+ (WebKit::RunJavaScriptConfirmResultListener::call):
+ (WebKit::RunJavaScriptConfirmResultListener::RunJavaScriptConfirmResultListener):
+ (WebKit::RunJavaScriptPromptResultListener::create):
+ (WebKit::RunJavaScriptPromptResultListener::~RunJavaScriptPromptResultListener):
+ (WebKit::RunJavaScriptPromptResultListener::call):
+ (WebKit::RunJavaScriptPromptResultListener::RunJavaScriptPromptResultListener):
+ (WKPageSetPageUIClient):
+ * UIProcess/API/C/WKPageUIClient.h:
+
+2015-12-08 Harris Papadopoulos <cpapadopoulos@apple.com>
+
</ins><span class="cx"> Merge r188553. rdar://problem/23816165
</span><span class="cx">
</span><span class="cx"> 2015-08-13 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/Shared/API/APIObject.h (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/Shared/API/APIObject.h 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Source/WebKit2/Shared/API/APIObject.h 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -137,6 +137,9 @@
</span><span class="cx"> ProcessPoolConfiguration,
</span><span class="cx"> PluginSiteDataManager,
</span><span class="cx"> Preferences,
</span><ins>+ RunJavaScriptAlertResultListener,
+ RunJavaScriptConfirmResultListener,
+ RunJavaScriptPromptResultListener,
</ins><span class="cx"> Session,
</span><span class="cx"> TextChecker,
</span><span class="cx"> UserContentController,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/Shared/API/c/WKBase.h (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -130,6 +130,9 @@
</span><span class="cx"> typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKPreferences* WKPreferencesRef;
</span><span class="cx"> typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
</span><ins>+typedef const struct OpaqueWKPageRunJavaScriptAlertResultListener* WKPageRunJavaScriptAlertResultListenerRef;
+typedef const struct OpaqueWKPageRunJavaScriptConfirmResultListener* WKPageRunJavaScriptConfirmResultListenerRef;
+typedef const struct OpaqueWKPageRunJavaScriptPromptResultListener* WKPageRunJavaScriptPromptResultListenerRef;
</ins><span class="cx"> typedef const struct OpaqueWKTextChecker* WKTextCheckerRef;
</span><span class="cx"> typedef const struct OpaqueWKSession* WKSessionRef;
</span><span class="cx"> typedef const struct OpaqueWKSessionState* WKSessionStateRef;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -1332,6 +1332,223 @@
</span><span class="cx"> toImpl(pageRef)->setPolicyClient(std::make_unique<PolicyClient>(wkClient));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
+static void fixUpBotchedPageUIClient(WKPageRef pageRef, const WKPageUIClientBase& wkClient)
+{
+ struct BotchedWKPageUIClientV4 {
+ 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;
+ void* shouldInterruptJavaScript_unavailable;
+
+ // Version 1.
+ WKPageCreateNewPageCallback_deprecatedForUseWithV1 createNewPage;
+ WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
+ WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
+ WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
+
+ // Version 2.
+ WKPageShowColorPickerCallback showColorPicker;
+ WKPageHideColorPickerCallback hideColorPicker;
+ WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
+
+ // Version 3.
+ WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
+
+ // Version 4.
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt;
+ };
+
+ const auto& botchedPageUIClient = reinterpret_cast<const BotchedWKPageUIClientV4&>(wkClient);
+
+ WKPageUIClientV5 fixedPageUIClient = {
+ { 5, botchedPageUIClient.base.clientInfo },
+ botchedPageUIClient.createNewPage_deprecatedForUseWithV0,
+ botchedPageUIClient.showPage,
+ botchedPageUIClient.close,
+ botchedPageUIClient.takeFocus,
+ botchedPageUIClient.focus,
+ botchedPageUIClient.unfocus,
+ botchedPageUIClient.runJavaScriptAlert_deprecatedForUseWithV0,
+ botchedPageUIClient.runJavaScriptConfirm_deprecatedForUseWithV0,
+ botchedPageUIClient.runJavaScriptPrompt_deprecatedForUseWithV0,
+ botchedPageUIClient.setStatusText,
+ botchedPageUIClient.mouseDidMoveOverElement_deprecatedForUseWithV0,
+ botchedPageUIClient.missingPluginButtonClicked_deprecatedForUseWithV0,
+ botchedPageUIClient.didNotHandleKeyEvent,
+ botchedPageUIClient.didNotHandleWheelEvent,
+ botchedPageUIClient.toolbarsAreVisible,
+ botchedPageUIClient.setToolbarsAreVisible,
+ botchedPageUIClient.menuBarIsVisible,
+ botchedPageUIClient.setMenuBarIsVisible,
+ botchedPageUIClient.statusBarIsVisible,
+ botchedPageUIClient.setStatusBarIsVisible,
+ botchedPageUIClient.isResizable,
+ botchedPageUIClient.setIsResizable,
+ botchedPageUIClient.getWindowFrame,
+ botchedPageUIClient.setWindowFrame,
+ botchedPageUIClient.runBeforeUnloadConfirmPanel,
+ botchedPageUIClient.didDraw,
+ botchedPageUIClient.pageDidScroll,
+ botchedPageUIClient.exceededDatabaseQuota,
+ botchedPageUIClient.runOpenPanel,
+ botchedPageUIClient.decidePolicyForGeolocationPermissionRequest,
+ botchedPageUIClient.headerHeight,
+ botchedPageUIClient.footerHeight,
+ botchedPageUIClient.drawHeader,
+ botchedPageUIClient.drawFooter,
+ botchedPageUIClient.printFrame,
+ botchedPageUIClient.runModal,
+ botchedPageUIClient.unused1,
+ botchedPageUIClient.saveDataToFileInDownloadsFolder,
+ botchedPageUIClient.shouldInterruptJavaScript_unavailable,
+ botchedPageUIClient.createNewPage,
+ botchedPageUIClient.mouseDidMoveOverElement,
+ botchedPageUIClient.decidePolicyForNotificationPermissionRequest,
+ botchedPageUIClient.unavailablePluginButtonClicked_deprecatedForUseWithV1,
+ botchedPageUIClient.showColorPicker,
+ botchedPageUIClient.hideColorPicker,
+ botchedPageUIClient.unavailablePluginButtonClicked,
+ botchedPageUIClient.pinnedStateDidChange,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ botchedPageUIClient.runJavaScriptAlert,
+ botchedPageUIClient.runJavaScriptConfirm,
+ botchedPageUIClient.runJavaScriptPrompt,
+ nullptr,
+ };
+
+ WKPageSetPageUIClient(pageRef, &fixedPageUIClient.base);
+}
+#endif
+
+namespace WebKit {
+
+class RunJavaScriptAlertResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptAlertResultListener> {
+public:
+ static PassRefPtr<RunJavaScriptAlertResultListener> create(std::function<void ()>&& completionHandler)
+ {
+ return adoptRef(new RunJavaScriptAlertResultListener(WTF::move(completionHandler)));
+ }
+
+ virtual ~RunJavaScriptAlertResultListener()
+ {
+ }
+
+ void call()
+ {
+ m_completionHandler();
+ }
+
+private:
+ explicit RunJavaScriptAlertResultListener(std::function<void ()>&& completionHandler)
+ : m_completionHandler(WTF::move(completionHandler))
+ {
+ }
+
+ std::function<void ()> m_completionHandler;
+};
+
+class RunJavaScriptConfirmResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptConfirmResultListener> {
+public:
+ static PassRefPtr<RunJavaScriptConfirmResultListener> create(std::function<void (bool)>&& completionHandler)
+ {
+ return adoptRef(new RunJavaScriptConfirmResultListener(WTF::move(completionHandler)));
+ }
+
+ virtual ~RunJavaScriptConfirmResultListener()
+ {
+ }
+
+ void call(bool result)
+ {
+ m_completionHandler(result);
+ }
+
+private:
+ explicit RunJavaScriptConfirmResultListener(std::function<void (bool)>&& completionHandler)
+ : m_completionHandler(WTF::move(completionHandler))
+ {
+ }
+
+ std::function<void (bool)> m_completionHandler;
+};
+
+class RunJavaScriptPromptResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptPromptResultListener> {
+public:
+ static PassRefPtr<RunJavaScriptPromptResultListener> create(std::function<void (const String&)>&& completionHandler)
+ {
+ return adoptRef(new RunJavaScriptPromptResultListener(WTF::move(completionHandler)));
+ }
+
+ virtual ~RunJavaScriptPromptResultListener()
+ {
+ }
+
+ void call(const String& result)
+ {
+ m_completionHandler(result);
+ }
+
+private:
+ explicit RunJavaScriptPromptResultListener(std::function<void (const String&)>&& completionHandler)
+ : m_completionHandler(WTF::move(completionHandler))
+ {
+ }
+
+ std::function<void (const String&)> m_completionHandler;
+};
+
+WK_ADD_API_MAPPING(WKPageRunJavaScriptAlertResultListenerRef, RunJavaScriptAlertResultListener)
+WK_ADD_API_MAPPING(WKPageRunJavaScriptConfirmResultListenerRef, RunJavaScriptConfirmResultListener)
+WK_ADD_API_MAPPING(WKPageRunJavaScriptPromptResultListenerRef, RunJavaScriptPromptResultListener)
+
+}
+
</ins><span class="cx"> void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
</span><span class="cx"> {
</span><span class="cx"> class UIClient : public API::Client<WKPageUIClientBase>, public API::UIClient {
</span><span class="lines">@@ -1435,57 +1652,88 @@
</span><span class="cx">
</span><span class="cx"> virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, std::function<void ()> completionHandler) override
</span><span class="cx"> {
</span><del>- if (!m_client.runJavaScriptAlert && !m_client.runJavaScriptAlert_deprecatedForUseWithV0) {
- completionHandler();
</del><ins>+ if (m_client.runJavaScriptAlert) {
+ RefPtr<RunJavaScriptAlertResultListener> listener = RunJavaScriptAlertResultListener::create(WTF::move(completionHandler));
+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
+ m_client.runJavaScriptAlert(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), toAPI(listener.get()), m_client.base.clientInfo);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_client.runJavaScriptAlert) {
</del><ins>+ if (m_client.runJavaScriptAlert_deprecatedForUseWithV5) {
</ins><span class="cx"> RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
</span><del>- m_client.runJavaScriptAlert(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo);
- } else
</del><ins>+ m_client.runJavaScriptAlert_deprecatedForUseWithV5(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo);
+ completionHandler();
+ return;
+ }
+
+ if (m_client.runJavaScriptAlert_deprecatedForUseWithV0) {
</ins><span class="cx"> m_client.runJavaScriptAlert_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
</span><ins>+ completionHandler();
+ return;
+ }
</ins><span class="cx">
</span><ins>+
</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 SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler) override
</span><span class="cx"> {
</span><del>- if (!m_client.runJavaScriptConfirm && !m_client.runJavaScriptConfirm_deprecatedForUseWithV0) {
- completionHandler(false);
</del><ins>+ if (m_client.runJavaScriptConfirm) {
+ RefPtr<RunJavaScriptConfirmResultListener> listener = RunJavaScriptConfirmResultListener::create(WTF::move(completionHandler));
+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
+ m_client.runJavaScriptConfirm(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), toAPI(listener.get()), m_client.base.clientInfo);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool result;
- if (m_client.runJavaScriptConfirm) {
</del><ins>+ if (m_client.runJavaScriptConfirm_deprecatedForUseWithV5) {
</ins><span class="cx"> RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
</span><del>- 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);
</del><ins>+ bool result = m_client.runJavaScriptConfirm_deprecatedForUseWithV5(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo);
+
+ completionHandler(result);
+ return;
+ }
+
+ if (m_client.runJavaScriptConfirm_deprecatedForUseWithV0) {
+ bool result = m_client.runJavaScriptConfirm_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
</ins><span class="cx">
</span><del>- completionHandler(result);
</del><ins>+ completionHandler(result);
+ return;
+ }
+
+ completionHandler(false);
</ins><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 SecurityOriginData& securityOriginData, std::function<void (const String&)> completionHandler) override
</span><span class="cx"> {
</span><del>- if (!m_client.runJavaScriptPrompt && !m_client.runJavaScriptPrompt_deprecatedForUseWithV0) {
- completionHandler(String());
</del><ins>+ if (m_client.runJavaScriptPrompt) {
+ RefPtr<RunJavaScriptPromptResultListener> listener = RunJavaScriptPromptResultListener::create(WTF::move(completionHandler));
+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
+ m_client.runJavaScriptPrompt(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), toAPI(securityOrigin.get()), toAPI(listener.get()), m_client.base.clientInfo);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::String> string;
- if (m_client.runJavaScriptPrompt) {
</del><ins>+ if (m_client.runJavaScriptPrompt_deprecatedForUseWithV5) {
</ins><span class="cx"> RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(securityOriginData.protocol, securityOriginData.host, securityOriginData.port);
</span><del>- 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)));
-
- if (!string) {
- completionHandler(String());
</del><ins>+ RefPtr<API::String> string = adoptRef(toImpl(m_client.runJavaScriptPrompt_deprecatedForUseWithV5(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), toAPI(securityOrigin.get()), m_client.base.clientInfo)));
+
+ if (string)
+ completionHandler(string->string());
+ else
+ completionHandler(String());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ if (m_client.runJavaScriptPrompt_deprecatedForUseWithV0) {
+ RefPtr<API::String> string = adoptRef(toImpl(m_client.runJavaScriptPrompt_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(defaultValue.impl()), toAPI(frame), m_client.base.clientInfo)));
+
+ if (string)
+ completionHandler(string->string());
+ else
+ completionHandler(String());
+ return;
+ }
</ins><span class="cx">
</span><del>- completionHandler(string->string());
</del><ins>+ completionHandler(String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void setStatusText(WebPageProxy* page, const String& text) override
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -48,11 +48,21 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKPluginUnavailabilityReason;
</span><span class="cx">
</span><ins>+
+WK_EXPORT WKTypeID WKPageRunJavaScriptAlertResultListenerGetTypeID();
+WK_EXPORT void WKPageRunJavaScriptAlertResultListenerCall(WKPageRunJavaScriptAlertResultListenerRef listener);
+
+WK_EXPORT WKTypeID WKPageRunJavaScriptConfirmResultListenerGetTypeID();
+WK_EXPORT void WKPageRunJavaScriptConfirmResultListenerCall(WKPageRunJavaScriptConfirmResultListenerRef listener, bool result);
+
+WK_EXPORT WKTypeID WKPageRunJavaScriptPromptResultListenerGetTypeID();
+WK_EXPORT void WKPageRunJavaScriptPromptResultListenerCall(WKPageRunJavaScriptPromptResultListenerRef listener, WKStringRef result);
+
</ins><span class="cx"> typedef void (*WKPageUIClientCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKPageConfigurationRef configuration, WKNavigationActionRef navigationAction, WKWindowFeaturesRef windowFeatures, const void *clientInfo);
</span><del>-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);
</del><ins>+typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptAlertResultListenerRef listener, const void *clientInfo);
+typedef void (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptConfirmResultListenerRef listener, const void *clientInfo);
+typedef void (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptPromptResultListenerRef listener, 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">@@ -102,7 +112,11 @@
</span><span class="cx"> typedef bool (*WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef message, WKFrameRef frame, const void *clientInfo);
</span><span class="cx"> typedef WKStringRef (*WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, const void *clientInfo);
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV1)(WKPageRef page, WKURLRequestRef urlRequest, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
</span><ins>+typedef void (*WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
+typedef bool (*WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
+typedef WKStringRef (*WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> typedef struct WKPageUIClientBase {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -451,9 +465,9 @@
</span><span class="cx"> // Version 5.
</span><span class="cx"> WKPageDecidePolicyForUserMediaPermissionRequestCallback decidePolicyForUserMediaPermissionRequest;
</span><span class="cx"> WKPageDidClickAutoFillButtonCallback didClickAutoFillButton;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt;
</ins><span class="cx"> WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
</span><span class="cx"> } WKPageUIClientV5;
</span><span class="cx">
</span><span class="lines">@@ -524,14 +538,16 @@
</span><span class="cx"> // Version 5.
</span><span class="cx"> WKPageDecidePolicyForUserMediaPermissionRequestCallback decidePolicyForUserMediaPermissionRequest;
</span><span class="cx"> WKPageDidClickAutoFillButtonCallback didClickAutoFillButton;
</span><del>- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</del><ins>+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert_deprecatedForUseWithV5;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm_deprecatedForUseWithV5;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt_deprecatedForUseWithV5;
</ins><span class="cx"> WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
</span><span class="cx">
</span><span class="cx"> // Version 6.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span><del>-
</del><ins>+ WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</ins><span class="cx"> } WKPageUIClientV6;
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="branchessafari601branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/ChangeLog (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/ChangeLog 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Tools/ChangeLog 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-08 Harris Papadopoulos <cpapadopoulos@apple.com>
+
+ Merge r192911. rdar://problem/23816165
+
+ 2015-12-01 Sam Weinig <sam@webkit.org>
+
+ Need completionHandler-based WebKit C SPI for alert, confirm, and prompt
+ <rdar://problem/23320863>
+ https://bugs.webkit.org/show_bug.cgi?id=151708
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+ Update for new WKPageUIClient.
+
</ins><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191032. rdar://problem/23769770
</span></span></pre></div>
<a id="branchessafari601branchToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/WebKitTestRunner/TestController.cpp (194077 => 194078)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/WebKitTestRunner/TestController.cpp 2015-12-15 00:35:35 UTC (rev 194077)
+++ branches/safari-601-branch/Tools/WebKitTestRunner/TestController.cpp 2015-12-15 00:35:39 UTC (rev 194078)
</span><span class="lines">@@ -265,6 +265,10 @@
</span><span class="cx"> 0, // runJavaScriptConfirm
</span><span class="cx"> 0, // runJavaScriptPrompt
</span><span class="cx"> 0, // mediaSessionMetadataDidChange
</span><ins>+ createOtherPage,
+ 0, // runJavaScriptAlert
+ 0, // runJavaScriptConfirm
+ 0 // runJavaScriptPrompt
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageUIClient(newPage, &otherPageUIClient.base);
</span><span class="cx">
</span><span class="lines">@@ -516,6 +520,10 @@
</span><span class="cx"> 0, // runJavaScriptConfirm
</span><span class="cx"> 0, // runJavaScriptPrompt
</span><span class="cx"> 0, // mediaSessionMetadataDidChange
</span><ins>+ createOtherPage,
+ 0, // runJavaScriptAlert
+ 0, // runJavaScriptConfirm
+ 0, // runJavaScriptPrompt
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient.base);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>