Backed out changeset aa442da7cfd8 (bug 1490344) for failing bc at browser/components/customizableui/test/browser_970511_undo_restore_default.js on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Wed, 16 Jan 2019 13:33:24 +0200
changeset 514060 475348be3c9463b96ee614c44afe33e3db17e960
parent 514059 08dccff23fbbceb21178a1379bf7a60616fb77ae
child 514061 4c800571b02d794cd54b02a2a2a3e0e4c21c5a0b
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1490344
milestone66.0a1
backs outaa442da7cfd82aeb542d30231e092c5e2491420a
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 aa442da7cfd8 (bug 1490344) for failing bc at browser/components/customizableui/test/browser_970511_undo_restore_default.js on a CLOSED TREE
browser/app/profile/firefox.js
browser/base/content/browser-tabsintitlebar.js
browser/components/customizableui/CustomizeMode.jsm
browser/components/nsBrowserGlue.js
layout/style/nsMediaFeatures.cpp
layout/style/test/chrome/bug418986-2.js
layout/style/test/test_media_queries.html
servo/components/style/gecko/media_features.rs
widget/LookAndFeel.h
widget/gtk/nsLookAndFeel.cpp
widget/gtk/nsLookAndFeel.h
widget/gtk/nsWindow.cpp
widget/gtk/nsWindow.h
widget/headless/HeadlessLookAndFeelGTK.cpp
widget/nsXPLookAndFeel.cpp
xpcom/ds/StaticAtoms.py
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -454,19 +454,19 @@ pref("browser.tabs.warnOnOpen", true);
 pref("browser.tabs.maxOpenBeforeWarn", 15);
 pref("browser.tabs.loadInBackground", true);
 pref("browser.tabs.opentabfor.middleclick", true);
 pref("browser.tabs.loadDivertedInBackground", false);
 pref("browser.tabs.loadBookmarksInBackground", false);
 pref("browser.tabs.loadBookmarksInTabs", false);
 pref("browser.tabs.tabClipWidth", 140);
 pref("browser.tabs.tabMinWidth", 76);
-// Initial titlebar state is managed by -moz-gtk-csd-hide-titlebar-by-default
-// on Linux.
-#ifndef UNIX_BUT_NOT_MAC
+#ifdef UNIX_BUT_NOT_MAC
+pref("browser.tabs.drawInTitlebar", false);
+#else
 pref("browser.tabs.drawInTitlebar", true);
 #endif
 
 // Offer additional drag space to the user. The drag space
 // will only be shown if browser.tabs.drawInTitlebar is true.
 pref("browser.tabs.extraDragSpace", false);
 
 // When tabs opened by links in other tabs via a combination of
--- a/browser/base/content/browser-tabsintitlebar.js
+++ b/browser/base/content/browser-tabsintitlebar.js
@@ -32,17 +32,17 @@ TabsInTitlebar = {
   get systemSupported() {
     let isSupported = false;
     switch (AppConstants.MOZ_WIDGET_TOOLKIT) {
       case "windows":
       case "cocoa":
         isSupported = true;
         break;
       case "gtk3":
-        isSupported = window.matchMedia("(-moz-gtk-csd-available)").matches;
+        isSupported = window.matchMedia("(-moz-gtk-csd-available)");
         break;
     }
     delete this.systemSupported;
     return this.systemSupported = isSupported;
   },
 
   get enabled() {
     return document.documentElement.getAttribute("tabsintitlebar") == "true";
@@ -53,20 +53,18 @@ TabsInTitlebar = {
       this._readPref();
   },
 
   _initialized: false,
   _disallowed: {},
   _prefName: "browser.tabs.drawInTitlebar",
 
   _readPref() {
-    let hiddenTitlebar =
-      Services.prefs.getBoolPref("browser.tabs.drawInTitlebar",
-        window.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches);
-    this.allowedBy("pref", hiddenTitlebar);
+    this.allowedBy("pref",
+                   Services.prefs.getBoolPref(this._prefName));
   },
 
   _update() {
     if (!this._initialized) {
       return;
     }
 
     let allowed = this.systemSupported &&
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -1577,33 +1577,31 @@ CustomizeMode.prototype = {
     }
   },
 
   _canDrawInTitlebar() {
     return this.window.TabsInTitlebar.systemSupported;
   },
 
   _updateTitlebarCheckbox() {
-    let drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref,
-      this.window.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches);
+    let drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref, true);
     let checkbox = this.$("customization-titlebar-visibility-checkbox");
     // Drawing in the titlebar means 'hiding' the titlebar.
     // We use the attribute rather than a property because if we're not in
     // customize mode the button is hidden and properties don't work.
     if (drawInTitlebar) {
       checkbox.removeAttribute("checked");
     } else {
       checkbox.setAttribute("checked", "true");
     }
   },
 
   _updateDragSpaceCheckbox() {
     let extraDragSpace = Services.prefs.getBoolPref(kExtraDragSpacePref);
-    let drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref,
-      this.window.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches);
+    let drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref, true);
     let menuBar = this.$("toolbar-menubar");
     let menuBarEnabled = menuBar
       && AppConstants.platform != "macosx"
       && menuBar.getAttribute("autohide") != "true";
 
     let checkbox = this.$("customization-extra-drag-space-checkbox");
     if (extraDragSpace) {
       checkbox.setAttribute("checked", "true");
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -316,20 +316,17 @@ let ACTORS = {
 
   let browserWindowFeatures =
     "chrome,all,dialog=no,extrachrome,menubar,resizable,scrollbars,status," +
     "location,toolbar,personalbar";
   let win = Services.ww.openWindow(null, "about:blank", null,
                                    browserWindowFeatures, null);
 
   // Hide the titlebar if the actual browser window will draw in it.
-  let hiddenTitlebar =
-    Services.prefs.getBoolPref("browser.tabs.drawInTitlebar",
-      win.matchMedia("(-moz-gtk-csd-hide-titlebar-by-default)").matches);
-  if (hiddenTitlebar) {
+  if (Services.prefs.getBoolPref("browser.tabs.drawInTitlebar")) {
     win.windowUtils.setChromeMargin(0, 2, 2, 2);
   }
 
   let docElt = win.document.documentElement;
   docElt.setAttribute("screenX", getValue("screenX"));
   docElt.setAttribute("screenY", getValue("screenY"));
 
   // The sizemode="maximized" attribute needs to be set before first paint.
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -385,23 +385,16 @@ PointerCapabilities Gecko_MediaFeatures_
   }
 
   rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDAvailable, &metricResult);
   if (NS_SUCCEEDED(rv) && metricResult) {
     sSystemMetrics->AppendElement(
         (nsStaticAtom*)nsGkAtoms::_moz_gtk_csd_available);
   }
 
-  rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDHideTitlebarByDefault,
-                           &metricResult);
-  if (NS_SUCCEEDED(rv) && metricResult) {
-    sSystemMetrics->AppendElement(
-        (nsStaticAtom*)nsGkAtoms::_moz_gtk_csd_hide_titlebar_by_default);
-  }
-
   rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDTransparentBackground,
                            &metricResult);
   if (NS_SUCCEEDED(rv) && metricResult) {
     sSystemMetrics->AppendElement(
         (nsStaticAtom*)nsGkAtoms::_moz_gtk_csd_transparent_background);
   }
 
   rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDMinimizeButton,
--- a/layout/style/test/chrome/bug418986-2.js
+++ b/layout/style/test/chrome/bug418986-2.js
@@ -49,17 +49,16 @@ var suppressed_toggles = [
   "-moz-scrollbar-start-backward",
   "-moz-scrollbar-start-forward",
   "-moz-scrollbar-thumb-proportional",
   "-moz-touch-enabled",
   "-moz-windows-compositor",
   "-moz-windows-default-theme",
   "-moz-windows-glass",
   "-moz-gtk-csd-available",
-  "-moz-gtk-csd-hide-titlebar-by-default",
   "-moz-gtk-csd-transparent-background",
   "-moz-gtk-csd-minimize-button",
   "-moz-gtk-csd-maximize-button",
   "-moz-gtk-csd-close-button",
 ];
 
 var toggles_enabled_in_content = [
   "-moz-touch-enabled",
--- a/layout/style/test/test_media_queries.html
+++ b/layout/style/test/test_media_queries.html
@@ -689,17 +689,16 @@ function run() {
   expression_should_not_be_parseable("-moz-mac-graphite-theme");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar");
   expression_should_not_be_parseable("-moz-windows-compositor");
   expression_should_not_be_parseable("-moz-windows-classic");
   expression_should_not_be_parseable("-moz-windows-glass");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled");
   expression_should_not_be_parseable("-moz-gtk-csd-available");
-  expression_should_not_be_parseable("-moz-gtk-csd-hide-titlebar-by-default");
   expression_should_not_be_parseable("-moz-gtk-csd-transparent-background");
   expression_should_not_be_parseable("-moz-gtk-csd-minimize-button");
   expression_should_not_be_parseable("-moz-gtk-csd-maximize-button");
   expression_should_not_be_parseable("-moz-gtk-csd-close-button");
   expression_should_be_parseable("-moz-touch-enabled");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: 0");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: 0");
@@ -711,17 +710,16 @@ function run() {
   expression_should_not_be_parseable("-moz-mac-graphite-theme: 0");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: 0");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: 0");
   expression_should_not_be_parseable("-moz-windows-compositor: 0");
   expression_should_not_be_parseable("-moz-windows-classic: 0");
   expression_should_not_be_parseable("-moz-windows-glass: 0");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: 0");
   expression_should_not_be_parseable("-moz-gtk-csd-available: 0");
-  expression_should_not_be_parseable("-moz-gtk-csd-hide-titlebar-by-default: 0");
   expression_should_not_be_parseable("-moz-gtk-csd-transparent-background: 0");
   expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: 0");
   expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: 0");
   expression_should_not_be_parseable("-moz-gtk-csd-close-button: 0");
   expression_should_be_parseable("-moz-touch-enabled: 0");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: 1");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: 1");
@@ -733,17 +731,16 @@ function run() {
   expression_should_not_be_parseable("-moz-mac-graphite-theme: 1");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: 1");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: 1");
   expression_should_not_be_parseable("-moz-windows-compositor: 1");
   expression_should_not_be_parseable("-moz-windows-classic: 1");
   expression_should_not_be_parseable("-moz-windows-glass: 1");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: 1");
   expression_should_not_be_parseable("-moz-gtk-csd-available: 1");
-  expression_should_not_be_parseable("-moz-gtk-csd-hide-titlebar-by-default: 1");
   expression_should_not_be_parseable("-moz-gtk-csd-transparent-background: 1");
   expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: 1");
   expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: 1");
   expression_should_not_be_parseable("-moz-gtk-csd-close-button: 1");
   expression_should_be_parseable("-moz-touch-enabled: 1");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: -1");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: -1");
@@ -756,17 +753,16 @@ function run() {
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: -1");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: -1");
   expression_should_not_be_parseable("-moz-windows-compositor: -1");
   expression_should_not_be_parseable("-moz-windows-classic: -1");
   expression_should_not_be_parseable("-moz-windows-glass: -1");
   expression_should_not_be_parseable("-moz-touch-enabled: -1");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: -1");
   expression_should_not_be_parseable("-moz-gtk-csd-available: -1");
-  expression_should_not_be_parseable("-moz-gtk-csd-hide-titlebar-by-default: -1");
   expression_should_not_be_parseable("-moz-gtk-csd-transparent-background: -1");
   expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: -1");
   expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: -1");
   expression_should_not_be_parseable("-moz-gtk-csd-close-button: -1");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: true");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: true");
   expression_should_not_be_parseable("-moz-scrollbar-end-backward: true");
@@ -778,17 +774,16 @@ function run() {
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: true");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: true");
   expression_should_not_be_parseable("-moz-windows-compositor: true");
   expression_should_not_be_parseable("-moz-windows-classic: true");
   expression_should_not_be_parseable("-moz-windows-glass: true");
   expression_should_not_be_parseable("-moz-touch-enabled: true");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: true");
   expression_should_not_be_parseable("-moz-gtk-csd-available: true");
-  expression_should_not_be_parseable("-moz-gtk-csd-hide-titlebar-by-default: true");
   expression_should_not_be_parseable("-moz-gtk-csd-transparent-background: true");
   expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: true");
   expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: true");
   expression_should_not_be_parseable("-moz-gtk-csd-close-button: true");
 
   // os version media queries (currently windows only)
   expression_should_not_be_parseable("-moz-os-version: windows-win7");
   expression_should_not_be_parseable("-moz-os-version: windows-win8");
--- a/servo/components/style/gecko/media_features.rs
+++ b/servo/components/style/gecko/media_features.rs
@@ -521,17 +521,17 @@ macro_rules! system_metric_feature {
 }
 
 lazy_static! {
     /// Adding new media features requires (1) adding the new feature to this
     /// array, with appropriate entries (and potentially any new code needed
     /// to support new types in these entries and (2) ensuring that either
     /// nsPresContext::MediaFeatureValuesChanged is called when the value that
     /// would be returned by the evaluator function could change.
-    pub static ref MEDIA_FEATURES: [MediaFeatureDescription; 51] = [
+    pub static ref MEDIA_FEATURES: [MediaFeatureDescription; 50] = [
         feature!(
             atom!("width"),
             AllowsRanges::Yes,
             Evaluator::Length(eval_width),
             ParsingRequirements::empty(),
         ),
         feature!(
             atom!("height"),
@@ -714,17 +714,16 @@ lazy_static! {
         system_metric_feature!(atom!("-moz-mac-yosemite-theme")),
         system_metric_feature!(atom!("-moz-windows-accent-color-in-titlebar")),
         system_metric_feature!(atom!("-moz-windows-compositor")),
         system_metric_feature!(atom!("-moz-windows-classic")),
         system_metric_feature!(atom!("-moz-windows-glass")),
         system_metric_feature!(atom!("-moz-menubar-drag")),
         system_metric_feature!(atom!("-moz-swipe-animation-enabled")),
         system_metric_feature!(atom!("-moz-gtk-csd-available")),
-        system_metric_feature!(atom!("-moz-gtk-csd-hide-titlebar-by-default")),
         system_metric_feature!(atom!("-moz-gtk-csd-transparent-background")),
         system_metric_feature!(atom!("-moz-gtk-csd-minimize-button")),
         system_metric_feature!(atom!("-moz-gtk-csd-maximize-button")),
         system_metric_feature!(atom!("-moz-gtk-csd-close-button")),
         system_metric_feature!(atom!("-moz-system-dark-theme")),
         // This is the only system-metric media feature that's accessible to
         // content as of today.
         // FIXME(emilio): Restrict (or remove?) when bug 1035774 lands.
--- a/widget/LookAndFeel.h
+++ b/widget/LookAndFeel.h
@@ -414,22 +414,16 @@ class LookAndFeel {
 
     /*
      * A boolean value indicating whether client-side decorations are
      * supported by the user's GTK version.
      */
     eIntID_GTKCSDAvailable,
 
     /*
-     * A boolean value indicating whether GTK+ system titlebar should be
-     * disabled by default.
-     */
-    eIntID_GTKCSDHideTitlebarByDefault,
-
-    /*
      * A boolean value indicating whether client-side decorations should
      * have transparent background.
      */
     eIntID_GTKCSDTransparentBackground,
 
     /*
      * A boolean value indicating whether client-side decorations should
      * contain a minimize button.
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -668,20 +668,16 @@ nsresult nsLookAndFeel::GetIntImpl(IntID
     case eIntID_ContextMenuOffsetVertical:
     case eIntID_ContextMenuOffsetHorizontal:
       aResult = 2;
       break;
     case eIntID_GTKCSDAvailable:
       EnsureInit();
       aResult = mCSDAvailable;
       break;
-    case eIntID_GTKCSDHideTitlebarByDefault:
-      EnsureInit();
-      aResult = mCSDHideTitlebarByDefault;
-      break;
     case eIntID_GTKCSDMaximizeButton:
       EnsureInit();
       aResult = mCSDMaximizeButton;
       break;
     case eIntID_GTKCSDMinimizeButton:
       EnsureInit();
       aResult = mCSDMinimizeButton;
       break;
@@ -1106,17 +1102,16 @@ void nsLookAndFeel::EnsureInit() {
   GetSystemFontInfo(gtk_widget_get_style_context(entry), &mFieldFontName,
                     &mFieldFontStyle);
 
   gtk_widget_destroy(window);
   g_object_unref(labelWidget);
 
   mCSDAvailable =
       nsWindow::GetSystemCSDSupportLevel() != nsWindow::CSD_SUPPORT_NONE;
-  mCSDHideTitlebarByDefault = nsWindow::HideTitlebarByDefault();
 
   mCSDCloseButton = false;
   mCSDMinimizeButton = false;
   mCSDMaximizeButton = false;
 
   // We need to initialize whole CSD config explicitly because it's queried
   // as -moz-gtk* media features.
   WidgetNodeType buttonLayout[TOOLBAR_BUTTONS];
--- a/widget/gtk/nsLookAndFeel.h
+++ b/widget/gtk/nsLookAndFeel.h
@@ -81,17 +81,16 @@ class nsLookAndFeel final : public nsXPL
   nscolor mTextSelectedText;
   nscolor mTextSelectedBackground;
   nscolor mMozScrollbar;
   nscolor mInfoBarText;
   char16_t mInvisibleCharacter;
   float mCaretRatio;
   bool mMenuSupportsDrag;
   bool mCSDAvailable;
-  bool mCSDHideTitlebarByDefault;
   bool mCSDMaximizeButton;
   bool mCSDMinimizeButton;
   bool mCSDCloseButton;
   bool mInitialized;
 
   void EnsureInit();
 
  private:
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -6341,35 +6341,16 @@ nsWindow::CSDSupportLevel nsWindow::GetS
     if (csdOverride && g_strcmp0(csdOverride, "1") == 0) {
       sCSDSupportLevel = CSD_SUPPORT_CLIENT;
     }
   }
 
   return sCSDSupportLevel;
 }
 
-bool nsWindow::HideTitlebarByDefault() {
-  static int hideTitlebar = -1;
-  if (hideTitlebar != -1) {
-    return hideTitlebar;
-  }
-
-  const char *currentDesktop = getenv("XDG_CURRENT_DESKTOP");
-  hideTitlebar =
-      (currentDesktop && GetSystemCSDSupportLevel() != CSD_SUPPORT_NONE);
-
-  if (hideTitlebar) {
-    hideTitlebar =
-        (strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr ||
-         strstr(currentDesktop, "GNOME") != nullptr);
-  }
-
-  return hideTitlebar;
-}
-
 bool nsWindow::TopLevelWindowUseARGBVisual() {
   static int useARGBVisual = -1;
   if (useARGBVisual != -1) {
     return useARGBVisual;
   }
 
   if (Preferences::HasUserValue("mozilla.widget.use-argb-visuals")) {
     useARGBVisual =
--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
@@ -380,17 +380,16 @@ class nsWindow final : public nsBaseWidg
     CSD_SUPPORT_UNKNOWN
   } CSDSupportLevel;
   /**
    * Get the support of Client Side Decoration by checking
    * the XDG_CURRENT_DESKTOP environment variable.
    */
   static CSDSupportLevel GetSystemCSDSupportLevel();
 
-  static bool HideTitlebarByDefault();
   static bool TopLevelWindowUseARGBVisual();
   static bool GetTopLevelWindowActiveState(nsIFrame* aFrame);
 
  protected:
   virtual ~nsWindow();
 
   // event handling code
   void DispatchActivateEvent(void);
--- a/widget/headless/HeadlessLookAndFeelGTK.cpp
+++ b/widget/headless/HeadlessLookAndFeelGTK.cpp
@@ -266,17 +266,16 @@ nsresult HeadlessLookAndFeel::GetIntImpl
       break;
     case eIntID_ContextMenuOffsetVertical:
       aResult = -6;
       break;
     case eIntID_ContextMenuOffsetHorizontal:
       aResult = 1;
       break;
     case eIntID_GTKCSDAvailable:
-    case eIntID_GTKCSDHideTitlebarByDefault:
     case eIntID_GTKCSDTransparentBackground:
       aResult = 0;
       break;
     case eIntID_GTKCSDMinimizeButton:
       aResult = 0;
       break;
     case eIntID_GTKCSDMaximizeButton:
       aResult = 0;
--- a/widget/nsXPLookAndFeel.cpp
+++ b/widget/nsXPLookAndFeel.cpp
@@ -66,18 +66,16 @@ nsLookAndFeelIntPref nsXPLookAndFeel::sI
     {"ui.scrollbarButtonAutoRepeatBehavior",
      eIntID_ScrollbarButtonAutoRepeatBehavior, false, 0},
     {"ui.tooltipDelay", eIntID_TooltipDelay, false, 0},
     {"ui.contextMenuOffsetVertical", eIntID_ContextMenuOffsetVertical, false,
      0},
     {"ui.contextMenuOffsetHorizontal", eIntID_ContextMenuOffsetHorizontal,
      false, 0},
     {"ui.GtkCSDAvailable", eIntID_GTKCSDAvailable, false, 0},
-    {"ui.GtkCSDHideTitlebarByDefault", eIntID_GTKCSDHideTitlebarByDefault,
-     false, 0},
     {"ui.GtkCSDTransparentBackground", eIntID_GTKCSDTransparentBackground,
      false, 0},
     {"ui.GtkCSDMinimizeButton", eIntID_GTKCSDMinimizeButton, false, 0},
     {"ui.GtkCSDMaximizeButton", eIntID_GTKCSDMaximizeButton, false, 0},
     {"ui.GtkCSDCloseButton", eIntID_GTKCSDCloseButton, false, 0},
     {"ui.systemUsesDarkTheme", eIntID_SystemUsesDarkTheme, false, 0},
     {"ui.prefersReducedMotion", eIntID_PrefersReducedMotion, false, 0},
     {"ui.primaryPointerCapabilities", eIntID_PrimaryPointerCapabilities, false,
--- a/xpcom/ds/StaticAtoms.py
+++ b/xpcom/ds/StaticAtoms.py
@@ -2158,17 +2158,16 @@ STATIC_ATOMS = [
     Atom("_moz_os_version", "-moz-os-version"),
     Atom("_moz_touch_enabled", "-moz-touch-enabled"),
     Atom("_moz_menubar_drag", "-moz-menubar-drag"),
     Atom("_moz_device_pixel_ratio", "-moz-device-pixel-ratio"),
     Atom("_moz_device_orientation", "-moz-device-orientation"),
     Atom("_moz_is_resource_document", "-moz-is-resource-document"),
     Atom("_moz_swipe_animation_enabled", "-moz-swipe-animation-enabled"),
     Atom("_moz_gtk_csd_available", "-moz-gtk-csd-available"),
-    Atom("_moz_gtk_csd_hide_titlebar_by_default", "-moz-gtk-csd-hide-titlebar-by-default"),
     Atom("_moz_gtk_csd_transparent_background", "-moz-gtk-csd-transparent-background"),
     Atom("_moz_gtk_csd_minimize_button", "-moz-gtk-csd-minimize-button"),
     Atom("_moz_gtk_csd_maximize_button", "-moz-gtk-csd-maximize-button"),
     Atom("_moz_gtk_csd_close_button", "-moz-gtk-csd-close-button"),
     Atom("_moz_system_dark_theme", "-moz-system-dark-theme"),
 
     # application commands
     Atom("Back", "Back"),