Backed out 4 changesets (bug 1719427) for causing build bustages. CLO…

…SED TREE Backed out changeset d6948ef7f495 (bug 1719427) Backed out changeset 4df7017f6bc9 (bug 1719427) Backed out changeset 8c5bb08f80e9 (bug 1719427) Backed out changeset e32004dd2014 (bug 1719427)
Brli · Nov 15, 2021 · 1a29f7d · 1a29f7d
1 parent 95ec487
commit 1a29f7d
Show file tree

Hide file tree

Showing 51 changed files with 2,188 additions and 2,456 deletions.
diff --git a/gfx/src/nsITheme.h b/gfx/src/nsITheme.h
@@ -10,7 +10,6 @@
 #define nsITheme_h_
 
 #include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/dom/BrowsingContext.h"
 #include "nsISupports.h"
 #include "nsID.h"
 #include "nscore.h"
@@ -256,7 +255,7 @@ class nsITheme : public nsISupports {
    */
   virtual bool ThemeNeedsComboboxDropmarker() = 0;
 
-  virtual bool ThemeSupportsScrollbarButtons() = 0;
+  virtual bool ThemeSupportsScrollbarButtons() { return true; }
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsITheme, NS_ITHEME_IID)
@@ -265,7 +264,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsITheme, NS_ITHEME_IID)
 //
 // Do not use directly, use nsPresContext::Theme instead.
 extern already_AddRefed<nsITheme> do_GetNativeThemeDoNotUseDirectly();
+extern already_AddRefed<nsITheme> do_GetAndroidNonNativeThemeDoNotUseDirectly();
 extern already_AddRefed<nsITheme> do_GetBasicNativeThemeDoNotUseDirectly();
-extern already_AddRefed<nsITheme> do_GetRDMThemeDoNotUseDirectly();
 
 #endif
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
@@ -1553,7 +1553,7 @@ nsITheme* nsPresContext::EnsureTheme() {
   if (Document()->ShouldAvoidNativeTheme()) {
     BrowsingContext* bc = Document()->GetBrowsingContext();
     if (bc && bc->Top()->InRDMPane()) {
-      mTheme = do_GetRDMThemeDoNotUseDirectly();
+      mTheme = do_GetAndroidNonNativeThemeDoNotUseDirectly();
     } else {
       mTheme = do_GetBasicNativeThemeDoNotUseDirectly();
     }

diff --git a/layout/xul/test/test_bug159346.xhtml b/layout/xul/test/test_bug159346.xhtml
@@ -27,8 +27,7 @@ function init()
   downButton = SpecialPowers.unwrap(
     SpecialPowers.InspectorUtils.getChildrenForNode(scrollbar, true)[4]);
   if (!downButton) {
-    ok(navigator.userAgent.indexOf("Linux") !== -1 ||
-       navigator.userAgent.indexOf("Mac") !== -1, "Theme doesn't support scrollbar buttons");
+    ok(navigator.userAgent.indexOf("Linux") !== -1, "Theme doesn't support scrollbar buttons");
     SimpleTest.finish();
     return;
   }

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -11991,28 +11991,16 @@
   value: false
   mirror: always
 
-# The style of scrollbars to use. Here are the current options:
-#
-#   0: Default platform scrollbar style.
-#   1: macOS scrollbars
-#   2: GTK scrollbars
-#   3: Android scrollbars
-#   4: Windows 10 scrollbars
-#
-# Note that switching to non-default scrollbars is experimental and other
-# scrollbar-related prefs may interfere with the experience. For example,
-# setting the GTK thumb size may have no effect when using non-GTK scrollbars
-# on GTK.
-- name: widget.non-native-theme.scrollbar.style
-  type: uint32_t
-  value: 0
-  mirror: always
-
-# An override that allows to override the default platform size. The size in CSS
-# pixels at full zoom of the minimum scrollbar width.
-- name: widget.non-native-theme.scrollbar.size.override
+# The size in CSS pixels at full zoom of the minimum scrollbar width.
+- name: widget.non-native-theme.scrollbar.size
   type: uint32_t
-  value: 0
+#if defined(MOZ_WIDGET_GTK)
+  value: 12
+#elif defined(ANDROID)
+  value: 6
+#else
+  value: 17
+#endif
   mirror: always
 
 # Whether the active thumb color should always use the themed colors, even if