Bug 1433869 - Disable CSD titlebar mode on untested/unknown systems for Release/Beta, r=jhorak a=ritu
authorMartin Stransky <stransky@redhat.com>
Mon, 29 Jan 2018 11:35:31 +0100
changeset 452391 cb55e5e2cdd5eb7e953b73f4bfce6c14a38b1c35
parent 452390 38c1798e2a2e7d06733f1d715af22d3d44d454e7
child 452392 1b25b61d773b47ad1ca081c2c88b0ae9286a38d3
push id8703
push userarchaeopteryx@coole-files.de
push dateWed, 14 Feb 2018 17:05:07 +0000
treeherdermozilla-beta@d5b7bbc956d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhorak, ritu
bugs1433869
milestone59.0
Bug 1433869 - Disable CSD titlebar mode on untested/unknown systems for Release/Beta, r=jhorak a=ritu MozReview-Commit-ID: JRF0BAbtkRN
widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -6878,17 +6878,23 @@ nsWindow::GetCSDSupportLevel() {
             sCSDSupportLevel = CSD_SUPPORT_FLAT;
         } else if (strstr(currentDesktop, "Unity") != nullptr) {
             sCSDSupportLevel = CSD_SUPPORT_FLAT;
         } else if (strstr(currentDesktop, "Pantheon") != nullptr) {
             sCSDSupportLevel = CSD_SUPPORT_FULL;
         } else if (strstr(currentDesktop, "LXQt") != nullptr) {
             sCSDSupportLevel = CSD_SUPPORT_FULL;
         } else {
+// Release or beta builds are not supposed to be broken
+// so disable titlebar rendering on untested/unknown systems.
+#if defined(RELEASE_OR_BETA)
+            sCSDSupportLevel = CSD_SUPPORT_NONE;
+#else
             sCSDSupportLevel = CSD_SUPPORT_FLAT;
+#endif
         }
     } else {
         sCSDSupportLevel = CSD_SUPPORT_NONE;
     }
 
     // We don't support CSD_SUPPORT_FULL on Wayland
     if (!GDK_IS_X11_DISPLAY(gdk_display_get_default()) &&
         sCSDSupportLevel == CSD_SUPPORT_FULL) {