Bug 1555543 - Adjust scrollbar-apz.css rule so it applies to all scrollbar elements. r=kats

Currently it won't match scrollbar elements in HTML documents where the root element has been switched out for something other than <html>, or in shadow trees. Also, move the rule into content.css now that we no longer switch between apz and non-apz versions of this file. Differential Revision: https://phabricator.services.mozilla.com/D33115 --HG-- extra : moz-landing-system : lando

Bug 1555543 - Adjust scrollbar-apz.css rule so it applies to all scrollbar elements. r=kats
Currently it won't match scrollbar elements in HTML documents where the root element has been switched out for something other than <html>, or in shadow trees. Also, move the rule into content.css now that we no longer switch between apz and non-apz versions of this file. Differential Revision: https://phabricator.services.mozilla.com/D33115 --HG-- extra : moz-landing-system : lando
683a4bd6 · Cameron McCormack · d831a078 · 683a4bd6 · 683a4bd6 · d831a078
Commit 683a4bd6 authored May 31, 2019 by Cameron McCormack
--- a/mobile/android/themes/geckoview/content.css
+++ b/mobile/android/themes/geckoview/content.css
@@ -3,7 +3,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 @import "defines.css";
-@import "scrollbar.css";

 @namespace url("http://www.w3.org/1999/xhtml");
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@@ -26,6 +25,7 @@ xul|scrollbar {
  background-image: none !important;
  border: 0px solid transparent !important;
  pointer-events: none;
+  display: block;
 }

 /* Scrollbar code will reset the margin to the correct side depending on

--- a/mobile/android/themes/geckoview/jar.mn
+++ b/mobile/android/themes/geckoview/jar.mn
@@ -28,4 +28,3 @@ geckoview.jar:
  skin/images/search.png                    (images/search.png)
  skin/images/textfield.png                 (images/textfield.png)
  skin/images/throbber.png                  (images/throbber.png)
-  skin/scrollbar.css                        (scrollbar-apz.css)
\ No newline at end of file
--- a/mobile/android/themes/geckoview/scrollbar-apz.css
+++ b/mobile/android/themes/geckoview/scrollbar-apz.css
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace url("http://www.w3.org/1999/xhtml");
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-html xul|scrollbar {
-  display: block;
-}