Changeset 194079 in webkit

Timestamp:

Dec 14, 2015, 4:35:41 PM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r193367. rdar://problem/23816165

Location:

branches/safari-601-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)

branches/safari-601-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-12-08  Harris Papadopoulos  <cpapadopoulos@apple.com>
+
+        Merge r193367. rdar://problem/23816165
+
+    2015-12-03  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
+
+            (Add missing function definitions)
+
+            * UIProcess/API/C/WKPage.cpp:
+            (WKPageRunJavaScriptAlertResultListenerGetTypeID):
+            (WKPageRunJavaScriptAlertResultListenerCall):
+            (WKPageRunJavaScriptConfirmResultListenerGetTypeID):
+            (WKPageRunJavaScriptConfirmResultListenerCall):
+            (WKPageRunJavaScriptPromptResultListenerGetTypeID):
+            (WKPageRunJavaScriptPromptResultListenerCall):
+
 2015-12-08  Harris Papadopoulos  <cpapadopoulos@apple.com>
 

branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -1550 +1550 @@
 }
 
+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)
 {