Diff
Modified: trunk/Source/WebKit2/ChangeLog (192910 => 192911)
--- trunk/Source/WebKit2/ChangeLog 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-01 22:09:49 UTC (rev 192911)
@@ -1,3 +1,31 @@
+2015-12-01 Sam Weinig <s...@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-01 Anders Carlsson <ander...@apple.com>
Remove WebKit2.framework
Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (192910 => 192911)
--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-12-01 22:09:49 UTC (rev 192911)
@@ -138,6 +138,9 @@
ProcessPoolConfiguration,
PluginSiteDataManager,
Preferences,
+ RunJavaScriptAlertResultListener,
+ RunJavaScriptConfirmResultListener,
+ RunJavaScriptPromptResultListener,
Session,
TextChecker,
UserContentController,
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (192910 => 192911)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-01 22:09:49 UTC (rev 192911)
@@ -131,6 +131,9 @@
typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
typedef const struct OpaqueWKPreferences* WKPreferencesRef;
typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
+typedef const struct OpaqueWKPageRunJavaScriptAlertResultListener* WKPageRunJavaScriptAlertResultListenerRef;
+typedef const struct OpaqueWKPageRunJavaScriptConfirmResultListener* WKPageRunJavaScriptConfirmResultListenerRef;
+typedef const struct OpaqueWKPageRunJavaScriptPromptResultListener* WKPageRunJavaScriptPromptResultListenerRef;
typedef const struct OpaqueWKTextChecker* WKTextCheckerRef;
typedef const struct OpaqueWKSession* WKSessionRef;
typedef const struct OpaqueWKSessionState* WKSessionStateRef;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (192910 => 192911)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-01 22:09:49 UTC (rev 192911)
@@ -1431,9 +1431,9 @@
WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
// Version 4.
- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt;
};
const auto& botchedPageUIClient = reinterpret_cast<const BotchedWKPageUIClientV4&>(wkClient);
@@ -1503,6 +1503,89 @@
}
#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)
+
+}
+
void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
{
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
@@ -1613,57 +1696,88 @@
virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, std::function<void ()> completionHandler) override
{
- if (!m_client.runJavaScriptAlert && !m_client.runJavaScriptAlert_deprecatedForUseWithV0) {
- completionHandler();
+ 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);
return;
}
- if (m_client.runJavaScriptAlert) {
+ if (m_client.runJavaScriptAlert_deprecatedForUseWithV5) {
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()), m_client.base.clientInfo);
- } else
+ 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) {
m_client.runJavaScriptAlert_deprecatedForUseWithV0(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
+ completionHandler();
+ return;
+ }
+
completionHandler();
}
virtual void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler) override
{
- if (!m_client.runJavaScriptConfirm && !m_client.runJavaScriptConfirm_deprecatedForUseWithV0) {
- completionHandler(false);
+ 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);
return;
}
- bool result;
- if (m_client.runJavaScriptConfirm) {
+ if (m_client.runJavaScriptConfirm_deprecatedForUseWithV5) {
RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::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);
+ 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);
- completionHandler(result);
+ completionHandler(result);
+ return;
+ }
+
+ completionHandler(false);
}
virtual void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, std::function<void (const String&)> completionHandler) override
{
- if (!m_client.runJavaScriptPrompt && !m_client.runJavaScriptPrompt_deprecatedForUseWithV0) {
- completionHandler(String());
+ 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);
return;
}
- RefPtr<API::String> string;
- if (m_client.runJavaScriptPrompt) {
+ if (m_client.runJavaScriptPrompt_deprecatedForUseWithV5) {
RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::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)));
-
- if (!string) {
- completionHandler(String());
+ 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());
return;
}
+
+ 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;
+ }
- completionHandler(string->string());
+ completionHandler(String());
}
virtual void setStatusText(WebPageProxy* page, const String& text) override
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (192910 => 192911)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-12-01 22:09:49 UTC (rev 192911)
@@ -48,11 +48,21 @@
};
typedef uint32_t WKPluginUnavailabilityReason;
+
+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);
+
typedef void (*WKPageUIClientCallback)(WKPageRef page, const void* clientInfo);
typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKPageConfigurationRef configuration, WKNavigationActionRef navigationAction, WKWindowFeaturesRef windowFeatures, const void *clientInfo);
-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);
+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);
typedef void (*WKPageTakeFocusCallback)(WKPageRef page, WKFocusDirection direction, const void *clientInfo);
typedef void (*WKPageFocusCallback)(WKPageRef page, const void *clientInfo);
typedef void (*WKPageUnfocusCallback)(WKPageRef page, const void *clientInfo);
@@ -99,7 +109,11 @@
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);
typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV1)(WKPageRef page, WKURLRequestRef urlRequest, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
+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);
+
typedef struct WKPageUIClientBase {
int version;
const void * clientInfo;
@@ -448,9 +462,9 @@
// Version 5.
WKPageDecidePolicyForUserMediaPermissionRequestCallback decidePolicyForUserMediaPermissionRequest;
WKPageDidClickAutoFillButtonCallback didClickAutoFillButton;
- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt;
WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
} WKPageUIClientV5;
@@ -521,14 +535,16 @@
// Version 5.
WKPageDecidePolicyForUserMediaPermissionRequestCallback decidePolicyForUserMediaPermissionRequest;
WKPageDidClickAutoFillButtonCallback didClickAutoFillButton;
- WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert_deprecatedForUseWithV5;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm_deprecatedForUseWithV5;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt_deprecatedForUseWithV5;
WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
// Version 6.
WKPageCreateNewPageCallback createNewPage;
-
+ WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
} WKPageUIClientV6;
#ifdef __cplusplus
Modified: trunk/Tools/ChangeLog (192910 => 192911)
--- trunk/Tools/ChangeLog 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Tools/ChangeLog 2015-12-01 22:09:49 UTC (rev 192911)
@@ -1,3 +1,16 @@
+2015-12-01 Sam Weinig <s...@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.
+
2015-12-01 Anders Carlsson <ander...@apple.com>
Remove WebKit2.framework
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (192910 => 192911)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-12-01 21:57:17 UTC (rev 192910)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-12-01 22:09:49 UTC (rev 192911)
@@ -275,6 +275,9 @@
0, // runJavaScriptPrompt
0, // mediaSessionMetadataDidChange
createOtherPage,
+ 0, // runJavaScriptAlert
+ 0, // runJavaScriptConfirm
+ 0 // runJavaScriptPrompt
};
WKPageSetPageUIClient(newPage, &otherPageUIClient.base);
@@ -534,6 +537,9 @@
0, // runJavaScriptPrompt
0, // mediaSessionMetadataDidChange
createOtherPage,
+ 0, // runJavaScriptAlert
+ 0, // runJavaScriptConfirm
+ 0, // runJavaScriptPrompt
};
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient.base);
