Bug 1433869 - Disable CSD titlebar mode on untested/unknown systems for Release/Beta, r?jhorak draft
authorMartin Stransky <stransky@redhat.com>
Mon, 29 Jan 2018 11:35:31 +0100
changeset 748216 e6c7514d00ca1f18f19469567e93ddc98a692ebb
parent 737984 8b188b59421352091dc80b76993a4dc878badbfe
child 748272 ce7d4baa418b6e35256a9cc4d1923e2064b74c33
child 748673 7a9340e4aff012616d4db6eab701e5c821be4555
push id97093
push userstransky@redhat.com
push dateMon, 29 Jan 2018 10:36:05 +0000
reviewersjhorak
bugs1433869
milestone60.0a1
Bug 1433869 - Disable CSD titlebar mode on untested/unknown systems for Release/Beta, r?jhorak MozReview-Commit-ID: JRF0BAbtkRN
widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -6882,17 +6882,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) {