Browse Source

fix: don't propagate GDK_BACKEND to subprocs

Shelley Vohr 3 years ago
parent
commit
711d8a4bf4

+ 16 - 0
shell/browser/electron_browser_main_parts.cc

@@ -375,8 +375,24 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
   fake_browser_process_->PostDestroyThreads();
 }
 
+#if defined(OS_LINUX)
+// static
+absl::optional<std::string>& ElectronBrowserMainParts::GetGDKBackend() {
+  static absl::optional<std::string> gdk_backend;
+  return gdk_backend;
+}
+#endif
+
 void ElectronBrowserMainParts::ToolkitInitialized() {
 #if defined(OS_LINUX)
+  // This is set by Chromium here:
+  // https://chromium-review.googlesource.com/c/chromium/src/+/2586184
+  // and can detrimentally affect external app behaviors, so we want to
+  // check if the user has set it so we can use it later.
+  std::string backend;
+  if (base::Environment::Create()->GetVar("GDK_BACKEND", &backend))
+    GetGDKBackend() = backend;
+
   auto linux_ui = BuildGtkUi();
   linux_ui->Initialize();
 

+ 6 - 0
shell/browser/electron_browser_main_parts.h

@@ -6,6 +6,7 @@
 #define SHELL_BROWSER_ELECTRON_BROWSER_MAIN_PARTS_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/metrics/field_trial.h"
@@ -88,6 +89,11 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
   Browser* browser() { return browser_.get(); }
   BrowserProcessImpl* browser_process() { return fake_browser_process_.get(); }
 
+#if defined(OS_LINUX)
+  // Used by platform_util to set GDK_BACKEND.
+  static absl::optional<std::string>& GetGDKBackend();
+#endif
+
  protected:
   // content::BrowserMainParts:
   int PreEarlyInitialization() override;

+ 12 - 0
shell/common/platform_util_linux.cc

@@ -122,6 +122,18 @@ bool XDGUtil(const std::vector<std::string>& argv,
   // bring up a new terminal if necessary.  See "man mailcap".
   options.environment["MM_NOTTTY"] = "1";
 
+  // If the user set a GDK_BACKEND value of their own, use that,
+  // otherwise unset it becuase Chromium is setting GDK_BACKEND
+  // during GTK initialization and we want to respect user preference.
+  // Setting values in EnvironmentMap to an empty-string
+  // will make sure that they get unset from the environment via
+  // AlterEnvironment().
+  const absl::optional<std::string>& gdk_backend =
+      electron::ElectronBrowserMainParts::GetGDKBackend();
+  options.environment["GDK_BACKEND"] = gdk_backend.has_value()
+                                           ? gdk_backend.value().c_str()
+                                           : base::NativeEnvironmentString();
+
   base::Process process = base::LaunchProcess(argv, options);
   if (!process.IsValid())
     return false;