Title: [169991] trunk/Source/WebKit2
- Revision
- 169991
- Author
- [email protected]
- Date
- 2014-06-15 11:23:50 -0700 (Sun, 15 Jun 2014)
Log Message
Remove WKPageRunJavaScriptInMainFrame_b
https://bugs.webkit.org/show_bug.cgi?id=133926
Reviewed by Dan Bernstein.
* UIProcess/API/C/WKPage.cpp:
(callRunJavaScriptBlockAndRelease): Deleted.
(WKPageRunJavaScriptInMainFrame_b): Deleted.
* UIProcess/API/C/WKPage.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169990 => 169991)
--- trunk/Source/WebKit2/ChangeLog 2014-06-15 18:07:09 UTC (rev 169990)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-15 18:23:50 UTC (rev 169991)
@@ -1,5 +1,17 @@
2014-06-15 Anders Carlsson <[email protected]>
+ Remove WKPageRunJavaScriptInMainFrame_b
+ https://bugs.webkit.org/show_bug.cgi?id=133926
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (callRunJavaScriptBlockAndRelease): Deleted.
+ (WKPageRunJavaScriptInMainFrame_b): Deleted.
+ * UIProcess/API/C/WKPage.h:
+
+2014-06-15 Anders Carlsson <[email protected]>
+
invalidateCallbackMap doesn’t pass the error parameter on to invalidate(), so script completion handler is passed the wrong error
https://bugs.webkit.org/show_bug.cgi?id=133921
<rdar://problem/17316653>
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (169990 => 169991)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-15 18:07:09 UTC (rev 169990)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-15 18:23:50 UTC (rev 169991)
@@ -1565,20 +1565,6 @@
toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueCallback::create(toGenericCallbackFunction(context, callback)));
}
-#ifdef __BLOCKS__
-static void callRunJavaScriptBlockAndRelease(WKSerializedScriptValueRef resultValue, WKErrorRef error, void* context)
-{
- WKPageRunJavaScriptBlock block = (WKPageRunJavaScriptBlock)context;
- block(resultValue, error);
- Block_release(block);
-}
-
-void WKPageRunJavaScriptInMainFrame_b(WKPageRef pageRef, WKStringRef scriptRef, WKPageRunJavaScriptBlock block)
-{
- WKPageRunJavaScriptInMainFrame(pageRef, scriptRef, Block_copy(block), callRunJavaScriptBlockAndRelease);
-}
-#endif
-
static std::function<void (const String&, CallbackBase::Error)> toGenericCallbackFunction(void* context, void (*callback)(WKStringRef, WKErrorRef, void*))
{
return [context, callback](const String& returnValue, CallbackBase::Error error) {
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (169990 => 169991)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-06-15 18:07:09 UTC (rev 169990)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-06-15 18:23:50 UTC (rev 169991)
@@ -212,10 +212,6 @@
typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function);
-#ifdef __BLOCKS__
-typedef void (^WKPageRunJavaScriptBlock)(WKSerializedScriptValueRef, WKErrorRef);
-WK_EXPORT void WKPageRunJavaScriptInMainFrame_b(WKPageRef page, WKStringRef script, WKPageRunJavaScriptBlock block);
-#endif
typedef void (*WKPageGetSourceForFrameFunction)(WKStringRef, WKErrorRef, void*);
WK_EXPORT void WKPageGetSourceForFrame(WKPageRef page, WKFrameRef frame, void* context, WKPageGetSourceForFrameFunction function);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
