Title: [191548] trunk/Source/WebKit2
- Revision
- 191548
- Author
- carlo...@webkit.org
- Date
- 2015-10-25 02:17:32 -0700 (Sun, 25 Oct 2015)
Log Message
Unreviewed. Fix GTK+ build after r191543.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_run_javascript):
(resourcesStreamReadCallback):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191547 => 191548)
--- trunk/Source/WebKit2/ChangeLog 2015-10-25 07:42:56 UTC (rev 191547)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-25 09:17:32 UTC (rev 191548)
@@ -1,3 +1,11 @@
+2015-10-25 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK+ build after r191543.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_run_javascript):
+ (resourcesStreamReadCallback):
+
2015-10-24 Tim Horton <timothy_hor...@apple.com>
Add a way to add user style sheets to WKUserContentController
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (191547 => 191548)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-10-25 07:42:56 UTC (rev 191547)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-10-25 09:17:32 UTC (rev 191548)
@@ -3057,7 +3057,7 @@
g_return_if_fail(script);
GTask* task = g_task_new(webView, cancellable, callback, userData);
- getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, bool, WebKit::CallbackBase::Error) {
+ getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, bool, const WebCore::ExceptionDetails&, WebKit::CallbackBase::Error) {
webkitWebViewRunJavaScriptCallback(serializedScriptValue, adoptGRef(task).get());
});
}
@@ -3148,7 +3148,7 @@
WebKitWebView* webView = WEBKIT_WEB_VIEW(g_task_get_source_object(task.get()));
gpointer outputStreamData = g_memory_output_stream_get_data(G_MEMORY_OUTPUT_STREAM(object));
getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(reinterpret_cast<const gchar*>(outputStreamData)),
- [task](API::SerializedScriptValue* serializedScriptValue, bool, WebKit::CallbackBase::Error) {
+ [task](API::SerializedScriptValue* serializedScriptValue, bool, const WebCore::ExceptionDetails&, WebKit::CallbackBase::Error) {
webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
