[webkit-changes] [170048] trunk/Source/WebKit2

Tue, 17 Jun 2014 00:42:49 -0700

Title: [170048] trunk/Source/WebKit2
Revision
170048
Author
[email protected]
Date
2014-06-17 00:42:32 -0700 (Tue, 17 Jun 2014)

Log Message

Unreviewed build fix for the GTK+ port. Removing the *Callback::create() wrappings
for lambda callbacks that aren't required anymore after the changes in r170041.

* 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (170047 => 170048)


--- trunk/Source/WebKit2/ChangeLog	2014-06-17 05:45:40 UTC (rev 170047)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-17 07:42:32 UTC (rev 170048)
@@ -1,3 +1,15 @@
+2014-06-17  Zan Dobersek  <[email protected]>
+
+        Unreviewed build fix for the GTK+ port. Removing the *Callback::create() wrappings
+        for lambda callbacks that aren't required anymore after the changes in r170041.
+
+        * 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-16  Jaehun Lim  <[email protected]>
 
         Unreviewed build fix when MHTML is enabled after r170041

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (170047 => 170048)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp	2014-06-17 05:45:40 UTC (rev 170047)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp	2014-06-17 07:42:32 UTC (rev 170048)
@@ -2513,9 +2513,9 @@
     g_return_if_fail(command);
 
     GTask* task = g_task_new(webView, cancellable, callback, userData);
-    getPage(webView)->validateCommand(String::fromUTF8(command), ValidateCommandCallback::create([task](const String&, bool isEnabled, int32_t, CallbackBase::Error) {
+    getPage(webView)->validateCommand(String::fromUTF8(command), [task](const String&, bool isEnabled, int32_t, CallbackBase::Error) {
         g_task_return_boolean(adoptGRef(task).get(), isEnabled);        
-    }));
+    });
 }
 
 /**
@@ -2628,9 +2628,9 @@
     g_return_if_fail(script);
 
     GTask* task = g_task_new(webView, cancellable, callback, userData);
-    getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), ScriptValueCallback::create([task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
+    getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
         webkitWebViewRunJavaScriptCallback(serializedScriptValue, adoptGRef(task).get());
-    }));
+    });
 }
 
 /**
@@ -2719,9 +2719,9 @@
     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](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
-        webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
-    }));
+        [task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
+            webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
+        });
 }
 
 /**
@@ -2897,9 +2897,9 @@
     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](API::Data* data, CallbackBase::Error) {
+    getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, CallbackBase::Error) {
         getContentsAsMHTMLDataCallback(data, task);
-    }), false);
+    }, false);
 }
 
 /**
@@ -2962,9 +2962,9 @@
     data->file = file;
     g_task_set_task_data(task, data, reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
 
-    getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
+    getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, CallbackBase::Error) {
         getContentsAsMHTMLDataCallback(data, task);
-    }), false);
+    }, false);
 }
 
 /**

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to