Backed out changeset d1615ffd338f (bug 1548475) for xpcshell failures CLOSED TREE
authorshindli <shindli@mozilla.com>
Thu, 09 May 2019 23:23:34 +0300
changeset 535183 374e8e43a94edb8c8ca4f067084048f372edf561
parent 535182 dd551956b3329ccf67cd8d6f279b93f04f79eeab
child 535184 450bc52291336e43367051a417836f280a804978
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1548475
milestone68.0a1
backs outd1615ffd338f011c56be6810eda9bd53782c272a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset d1615ffd338f (bug 1548475) for xpcshell failures CLOSED TREE
dom/plugins/base/nsPluginHost.cpp
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -100,20 +100,16 @@
 #include "mozilla/dom/Promise.h"
 
 #if defined(XP_WIN)
 #  include "nsIWindowMediator.h"
 #  include "nsIBaseWindow.h"
 #  include "windows.h"
 #  include "winbase.h"
 #endif
-#if (MOZ_WIDGET_GTK)
-#  include <gdk/gdk.h>
-#  include <gdk/gdkx.h>
-#endif
 
 #include "npapi.h"
 
 using namespace mozilla;
 using mozilla::TimeStamp;
 using mozilla::dom::Document;
 using mozilla::dom::FakePluginMimeEntry;
 using mozilla::dom::FakePluginTagInit;
@@ -357,25 +353,19 @@ nsPluginHost::nsPluginHost()
       mOverrideInternalTypes(false),
       mPluginsDisabled(false),
       mPluginEpoch(0) {
   // check to see if pref is set at startup to let plugins take over in
   // full page mode for certain image mime types that we handle internally
   mOverrideInternalTypes =
       Preferences::GetBool("plugin.override_internal_types", false);
 
-  bool waylandBackend = false;
-#if MOZ_WIDGET_GTK
-  waylandBackend = !GDK_IS_X11_DISPLAY(gdk_display_get_default());
-#endif
-  mPluginsDisabled =
-      Preferences::GetBool("plugin.disable", false) || waylandBackend;
-  if (!waylandBackend) {
-    Preferences::AddStrongObserver(this, "plugin.disable");
-  }
+  mPluginsDisabled = Preferences::GetBool("plugin.disable", false);
+
+  Preferences::AddStrongObserver(this, "plugin.disable");
 
   nsCOMPtr<nsIObserverService> obsService =
       mozilla::services::GetObserverService();
   if (obsService) {
     obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
     if (XRE_IsParentProcess()) {
       obsService->AddObserver(this, "plugin-blocklist-updated", false);
     }