879515 - Port GTK2 to GTK3 - dom/plugins fixes

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Martin Stránský [:stransky] (ni? me)]

+++ This bug was initially created as a clone of Bug #627699 +++

GTK+ 3.0 and GNOME 3 are approaching and we should get Firefox ready for them. This bug is about missing pieces in dom/plugins directory.

Comment 1

[Martin Stránský [:stransky] (ni? me)]

Attachment: dom/plugins patch

Katl, can you please check this one? It moves xt plugins to gtk2 only. I'd like to go this way for now. 

The future fix may adjust gtk2bin for gtk3 add/or build plugin-container with gtk2.

Comment 2

[Karl Tomlinson (:karlt)]

Comment on attachment 758234 [details] [diff] [review]
dom/plugins patch

(In reply to Martin Stránský from comment #1)
> Created attachment 758234 [details] [diff] [review]
> dom/plugins patch
> 
> Katl, can you please check this one? It moves xt plugins to gtk2 only. I'd
> like to go this way for now.

That's fine, but https://hg.mozilla.org/mozilla-central/diff/94c819a423ff/widget/gtkxtbin/gtk2xtbin.h added GTK3 specific includes.  What has changed your mind here?

>     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
>         CPP_SOURCES += [
>             'nsPluginNativeWindowGtk2.cpp',
>         ]
>+    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
>+        CPP_SOURCES += [
>+            'nsPluginNativeWindowGtk3.cpp',
>+        ]
>     elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
>         CPP_SOURCES += [
>             'nsPluginNativeWindowQt.cpp',
>         ]
>     else:
>         CPP_SOURCES += [
>             'nsPluginNativeWindow.cpp',
>         ]

nsPluginNativeWindowGtk3.cpp differs from nsPluginNativeWindow.cpp in that it overrides CallSetWindow() to return NS_ERROR_FAILURE.  I don't know why that is necessary.  Can we just use nsPluginNativeWindow.cpp (as is) for now?
CallSetWindow() doesn't feel like the right place to try to disable plugins.

Comment 3

[Martin Stránský [:stransky] (ni? me)]

Attachment: v2

This one should address that.

(In reply to Karl Tomlinson (:karlt) from comment #2)
> > Katl, can you please check this one? It moves xt plugins to gtk2 only. I'd
> > like to go this way for now.
> 
> That's fine, but
> https://hg.mozilla.org/mozilla-central/diff/94c819a423ff/widget/gtkxtbin/
> gtk2xtbin.h added GTK3 specific includes.  What has changed your mind here?

I expected to add plugin support but seems to be more complicated so I'd like to finish the main part ad then work on plugins.

> nsPluginNativeWindowGtk3.cpp differs from nsPluginNativeWindow.cpp in that
> it overrides CallSetWindow() to return NS_ERROR_FAILURE.  I don't know why
> that is necessary.  Can we just use nsPluginNativeWindow.cpp (as is) for now?
> CallSetWindow() doesn't feel like the right place to try to disable plugins.

nsPluginNativeWindow.cpp is fine too. I did nsPluginNativeWindowGtk3.cpp due to some build issues but it's already fixed.

Comment 4

[Martin Stránský [:stransky] (ni? me)]

Try build https://tbpl.mozilla.org/?tree=Try&rev=b800298747b1

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/9aeae1c96b26

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/9aeae1c96b26