Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1548475 - [Wayland] Disable Flash on Wayland backend, r=glandium

Browse Source 
Reviewers: jmathies

Reviewed By: jmathies

Bug #: 1548475

Differential Revision: https://phabricator.services.mozilla.com/D30020

--HG--
extra : rebase_source : 8ad63589add41a921bec2834aa82bdabb039fcda
This commit is contained in:
Martin Stransky 2019-09-02 19:05:45 +03:00
parent 93059c799a
commit 85351067cf
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dom/plugins/base/nsPluginHost.cpp
View File

@ -105,6 +105,10 @@
# include "windows.h"
# include "winbase.h"
#endif
#if (MOZ_WIDGET_GTK)
# include <gdk/gdk.h>
# include <gdk/gdkx.h>
#endif
#include "npapi.h"
@ -358,9 +362,18 @@ nsPluginHost::nsPluginHost()
mOverrideInternalTypes =
Preferences::GetBool("plugin.override_internal_types", false);
mPluginsDisabled = Preferences::GetBool("plugin.disable", false);
Preferences::AddStrongObserver(this, "plugin.disable");
bool waylandBackend = false;
#if MOZ_WIDGET_GTK
GdkDisplay* display = gdk_display_get_default();
if (display) {
waylandBackend = !GDK_IS_X11_DISPLAY(display);
}
#endif
mPluginsDisabled =
Preferences::GetBool("plugin.disable", false) || waylandBackend;
if (!waylandBackend) {
Preferences::AddStrongObserver(this, "plugin.disable");
}
nsCOMPtr<nsIObserverService> obsService =
mozilla::services::GetObserverService();