Changeset 152344 in webkit

Timestamp:

Jul 3, 2013 1:43:41 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Migrate WebKitWebContext to GTask
​https://bugs.webkit.org/show_bug.cgi?id=117153

Reviewed by Gustavo Noronha Silva.

• UIProcess/API/gtk/WebKitWebContext.cpp:

(webkitWebContextGetPluginThread):
(webkit_web_context_get_plugins):
(webkit_web_context_get_plugins_finish):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebContext.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Migrate WebKitWebContext to GTask
+        https://bugs.webkit.org/show_bug.cgi?id=117153
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkitWebContextGetPluginThread):
+        (webkit_web_context_get_plugins):
+        (webkit_web_context_get_plugins_finish):
+
 2013-07-02  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -494 +494 @@
 }
 
-struct GetPluginsAsyncData {
-    Vector<PluginModuleInfo> plugins;
-};
-WEBKIT_DEFINE_ASYNC_DATA_STRUCT(GetPluginsAsyncData)
-
-static void webkitWebContextGetPluginThread(GSimpleAsyncResult* result, GObject* object, GCancellable*)
-{
-    GetPluginsAsyncData* data = static_cast<GetPluginsAsyncData*>(g_simple_async_result_get_op_res_gpointer(result));
-    data->plugins = WEBKIT_WEB_CONTEXT(object)->priv->context->pluginInfoStore().plugins();
+static void destroyPluginList(GList* plugins)
+{
+    g_list_free_full(plugins, g_object_unref);
+}
+
+static void webkitWebContextGetPluginThread(GTask* task, gpointer object, gpointer taskData, GCancellable*)
+{
+    Vector<PluginModuleInfo> plugins = WEBKIT_WEB_CONTEXT(object)->priv->context->pluginInfoStore().plugins();
+    GList* returnValue = 0;
+    for (size_t i = 0; i < plugins.size(); ++i)
+        returnValue = g_list_prepend(returnValue, webkitPluginCreate(plugins[i]));
+    g_task_return_pointer(task, returnValue, reinterpret_cast<GDestroyNotify>(destroyPluginList));
 }
 
@@ -521 +524 @@
     g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
 
-    GRefPtr<GSimpleAsyncResult> result = adoptGRef(g_simple_async_result_new(G_OBJECT(context), callback, userData,
-                                                                             reinterpret_cast<gpointer>(webkit_web_context_get_plugins)));
-    g_simple_async_result_set_op_res_gpointer(result.get(), createGetPluginsAsyncData(),
-                                              reinterpret_cast<GDestroyNotify>(destroyGetPluginsAsyncData));
-    g_simple_async_result_run_in_thread(result.get(), webkitWebContextGetPluginThread, G_PRIORITY_DEFAULT, cancellable);
+    GRefPtr<GTask> task = adoptGRef(g_task_new(context, cancellable, callback, userData));
+    g_task_run_in_thread(task.get(), webkitWebContextGetPluginThread);
 }
 
@@ -542 +542 @@
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), 0);
-    g_return_val_if_fail(G_IS_ASYNC_RESULT(result), 0);
-
-    GSimpleAsyncResult* simpleResult = G_SIMPLE_ASYNC_RESULT(result);
-    g_warn_if_fail(g_simple_async_result_get_source_tag(simpleResult) == webkit_web_context_get_plugins);
-
-    if (g_simple_async_result_propagate_error(simpleResult, error))
-        return 0;
-
-    GetPluginsAsyncData* data = static_cast<GetPluginsAsyncData*>(g_simple_async_result_get_op_res_gpointer(simpleResult));
-    GList* plugins = 0;
-    for (size_t i = 0; i < data->plugins.size(); ++i)
-        plugins = g_list_prepend(plugins, webkitPluginCreate(data->plugins[i]));
-
-    return plugins;
+    g_return_val_if_fail(g_task_is_valid(result, context), 0);
+
+    return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
 }