Modified: trunk/Source/WebKit2/ChangeLog (169968 => 169969)
--- trunk/Source/WebKit2/ChangeLog 2014-06-14 15:43:10 UTC (rev 169968)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 15:53:36 UTC (rev 169969)
@@ -1,3 +1,19 @@
+2014-06-14 Zan Dobersek <[email protected]>
+
+ Unreviewed build fix for the GTK+ port.
+ Fixing the callback lambda parameters after r169962.
+
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ (webkitPrintOperationPrintPagesForFrame):
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ (webkit_web_resource_get_data):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_can_execute_editing_command):
+ (webkit_web_view_run_javascript):
+ (resourcesStreamReadCallback):
+ (webkit_web_view_save):
+ (webkit_web_view_save_to_file):
+
2014-06-14 Csaba Osztrogonác <[email protected]>
URTBF after r169943 and r169946, use the format of set/get.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (169968 => 169969)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-06-14 15:43:10 UTC (rev 169968)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-06-14 15:53:36 UTC (rev 169969)
@@ -274,7 +274,7 @@
PrintInfo printInfo(printSettings, pageSetup, printOperation->priv->printMode);
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));
g_object_ref(printOperation);
- page->drawPagesForPrinting(webFrame, printInfo, PrintFinishedCallback::create([printOperation](bool /*error*/, API::Error* printError) {
+ page->drawPagesForPrinting(webFrame, printInfo, PrintFinishedCallback::create([printOperation](API::Error* printError, CallbackBase::Error) {
drawPagesForPrintingCompleted(printError, adoptGRef(printOperation).get());
}));
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (169968 => 169969)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-06-14 15:43:10 UTC (rev 169968)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-06-14 15:53:36 UTC (rev 169969)
@@ -340,12 +340,12 @@
GTask* task = g_task_new(resource, cancellable, callback, userData);
g_task_set_task_data(task, createResourceGetDataAsyncData(), reinterpret_cast<GDestroyNotify>(destroyResourceGetDataAsyncData));
if (resource->priv->isMainResource)
- resource->priv->frame->getMainResourceData(DataCallback::create([task](bool /*error*/, API::Data* data) {
+ resource->priv->frame->getMainResourceData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
resourceDataCallback(data, adoptGRef(task).get());
}));
else {
String url = ""
- resource->priv->frame->getResourceData(API::URL::create(url).get(), DataCallback::create([task](bool /*error*/, API::Data* data) {
+ resource->priv->frame->getResourceData(API::URL::create(url).get(), DataCallback::create([task](API::Data* data, CallbackBase::Error) {
resourceDataCallback(data, adoptGRef(task).get());
}));
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (169968 => 169969)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-06-14 15:43:10 UTC (rev 169968)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-06-14 15:53:36 UTC (rev 169969)
@@ -2513,7 +2513,7 @@
g_return_if_fail(command);
GTask* task = g_task_new(webView, cancellable, callback, userData);
- getPage(webView)->validateCommand(String::fromUTF8(command), ValidateCommandCallback::create([task](bool /*error*/, StringImpl* /*command*/, bool isEnabled, int32_t /*state*/) {
+ getPage(webView)->validateCommand(String::fromUTF8(command), ValidateCommandCallback::create([task](StringImpl*, bool isEnabled, int32_t, CallbackBase::Error) {
g_task_return_boolean(adoptGRef(task).get(), isEnabled);
}));
}
@@ -2628,7 +2628,7 @@
g_return_if_fail(script);
GTask* task = g_task_new(webView, cancellable, callback, userData);
- getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), ScriptValueCallback::create([task](bool /*error*/, WebSerializedScriptValue* serializedScriptValue) {
+ getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), ScriptValueCallback::create([task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
webkitWebViewRunJavaScriptCallback(serializedScriptValue, adoptGRef(task).get());
}));
}
@@ -2719,7 +2719,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)),
- ScriptValueCallback::create([task](bool /*error*/, WebSerializedScriptValue* serializedScriptValue) {
+ ScriptValueCallback::create([task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
}));
}
@@ -2897,7 +2897,7 @@
GTask* task = g_task_new(webView, cancellable, callback, userData);
g_task_set_source_tag(task, reinterpret_cast<gpointer>(webkit_web_view_save));
g_task_set_task_data(task, createViewSaveAsyncData(), reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
- getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](bool /*error*/, API::Data* data) {
+ getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
getContentsAsMHTMLDataCallback(data, task);
}), false);
}
@@ -2962,7 +2962,7 @@
data->file = file;
g_task_set_task_data(task, data, reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
- getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](bool /*error*/, API::Data* data) {
+ getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
getContentsAsMHTMLDataCallback(data, task);
}), false);
}
