Title: [194079] branches/safari-601-branch/Source/WebKit2
- Revision
- 194079
- Author
- [email protected]
- Date
- 2015-12-14 16:35:41 -0800 (Mon, 14 Dec 2015)
Log Message
Merge r193367. rdar://problem/23816165
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (194078 => 194079)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-15 00:35:39 UTC (rev 194078)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-15 00:35:41 UTC (rev 194079)
@@ -1,5 +1,25 @@
2015-12-08 Harris Papadopoulos <[email protected]>
+ Merge r193367. rdar://problem/23816165
+
+ 2015-12-03 Sam Weinig <[email protected]>
+
+ Need completionHandler-based WebKit C SPI for alert, confirm, and prompt
+ <rdar://problem/23320863>
+ https://bugs.webkit.org/show_bug.cgi?id=151708
+
+ (Add missing function definitions)
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageRunJavaScriptAlertResultListenerGetTypeID):
+ (WKPageRunJavaScriptAlertResultListenerCall):
+ (WKPageRunJavaScriptConfirmResultListenerGetTypeID):
+ (WKPageRunJavaScriptConfirmResultListenerCall):
+ (WKPageRunJavaScriptPromptResultListenerGetTypeID):
+ (WKPageRunJavaScriptPromptResultListenerCall):
+
+2015-12-08 Harris Papadopoulos <[email protected]>
+
Merge r192911. rdar://problem/23816165
2015-12-01 Sam Weinig <[email protected]>
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (194078 => 194079)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-15 00:35:39 UTC (rev 194078)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-15 00:35:41 UTC (rev 194079)
@@ -1549,6 +1549,36 @@
}
+WKTypeID WKPageRunJavaScriptAlertResultListenerGetTypeID()
+{
+ return toAPI(RunJavaScriptAlertResultListener::APIType);
+}
+
+void WKPageRunJavaScriptAlertResultListenerCall(WKPageRunJavaScriptAlertResultListenerRef listener)
+{
+ toImpl(listener)->call();
+}
+
+WKTypeID WKPageRunJavaScriptConfirmResultListenerGetTypeID()
+{
+ return toAPI(RunJavaScriptConfirmResultListener::APIType);
+}
+
+void WKPageRunJavaScriptConfirmResultListenerCall(WKPageRunJavaScriptConfirmResultListenerRef listener, bool result)
+{
+ toImpl(listener)->call(result);
+}
+
+WKTypeID WKPageRunJavaScriptPromptResultListenerGetTypeID()
+{
+ return toAPI(RunJavaScriptPromptResultListener::APIType);
+}
+
+void WKPageRunJavaScriptPromptResultListenerCall(WKPageRunJavaScriptPromptResultListenerRef listener, WKStringRef result)
+{
+ toImpl(listener)->call(toWTFString(result));
+}
+
void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
{
class UIClient : public API::Client<WKPageUIClientBase>, public API::UIClient {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
