[Webkit-unassigned] [Bug 98262] [GTK] Build break when NETSCAPE_PLUGIN_API macro is off

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=98262

Carlos Garcia Campos <cgarcia at igalia.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #244122|review?                     |review-
              Flags|                            |

--- Comment #5 from Carlos Garcia Campos <cgarcia at igalia.com> ---
Comment on attachment 244122
  --> https://bugs.webkit.org/attachment.cgi?id=244122
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=244122&action=review

> Source/WebKit2/PluginProcess/unix/PluginControllerProxyUnix.cpp:30
>  #if ENABLE(PLUGIN_PROCESS)
> +#if ENABLE(NETSCAPE_PLUGIN_API)

I don't think this is correct, why using NETSCAPE_PLUGIN_API here? ENABLE_PLUGIN_PROCESS is what it should be false, I guess.

> Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp:32
>  #if ENABLE(PLUGIN_PROCESS)
> +#if ENABLE(NETSCAPE_PLUGIN_API)

Ditto.

> Source/WebKit2/PluginProcess/unix/PluginProcessUnix.cpp:30
>  #if ENABLE(PLUGIN_PROCESS)
> +#if ENABLE(NETSCAPE_PLUGIN_API)

Ditto.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:690
> +#if ENABLE(NETSCAPE_PLUGIN_API)
>      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));
> +#else
> +    g_task_return_pointer(task, NULL, NULL);
> +#endif

Why doing this in the thread body? If NETSCAPE_PLUGIN_API is not enabled we should call g_task_return_pointer before spawning the thread.

> Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:68
> +#if ENABLE(NETSCAPE_PLUGIN_API)

I guess this should be #if ENABLE(PLUGIN_PROCESS)

> Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:32
>  #if ENABLE(PLUGIN_PROCESS)
> +#if ENABLE(NETSCAPE_PLUGIN_API)

Same here about duplicated if

> Source/WebKit2/WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp:30
>  #if ENABLE(PLUGIN_PROCESS)
> +#if ENABLE(NETSCAPE_PLUGIN_API)

Ditto.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20150107/50dce2f4/attachment-0002.html>