Merge inbound to mozilla-central. a=merge

browser/base/content/browser.css

@@ -8,19 +8,18 @@
 :root {
   --panelui-subview-transition-duration: 150ms;
   --lwt-additional-images: none;
+  --lwt-background-alignment: right top;
   --lwt-background-tiling: no-repeat;
 }
 
-:root:-moz-lwtheme {
-  color: var(--lwt-text-color) !important;
-}
-
 :root:-moz-lwtheme {
   background-color: var(--lwt-accent-color) !important;
+  color: var(--lwt-text-color) !important;
 }
 
 :root:-moz-lwtheme[lwtheme-image] {
   background-image: var(--lwt-header-image) !important;
+  background-repeat: no-repeat;
   background-position: right top !important;
 }
 
@@ -500,11 +499,6 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
   max-width: none;
 }
 
-#main-window:-moz-lwtheme {
-  background-repeat: no-repeat;
-  background-position: top right;
-}
-
 %ifdef XP_MACOSX
 #main-window[inFullscreen="true"] {
   padding-top: 0; /* override drawintitlebar="true" */

toolkit/components/extensions/WebExtensionPolicy.cpp

@@ -149,7 +149,7 @@ WebExtensionPolicy::WebExtensionPolicy(GlobalObject& aGlobal,
   }
 
   MatchPatternOptions options;
-  options.mRestrictSchemes = HasPermission(nsGkAtoms::mozillaAddons);
+  options.mRestrictSchemes = !HasPermission(nsGkAtoms::mozillaAddons);
 
   mHostPermissions = ParseMatches(aGlobal, aInit.mAllowedOrigins, options,
                                   ErrorBehavior::CreateEmptyPattern, aRv);

toolkit/components/extensions/test/browser/browser_ext_themes_additional_backgrounds_alignment.js

@@ -3,9 +3,8 @@
 /* globals InspectorUtils */
 
 // Case 1 - When there is a headerURL image and additional_backgrounds_alignment is not specified.
-// So background-position should default to "left top"
+// So background-position should default to "right top"
 add_task(async function test_default_additional_backgrounds_alignment() {
-  const LEFT_TOP = "0% 0%";
   const RIGHT_TOP = "100% 0%";
 
   let extension = ExtensionTestUtils.loadExtension({
@@ -44,7 +43,7 @@ add_task(async function test_default_additional_backgrounds_alignment() {
 
   Assert.equal(
     toolboxCS.getPropertyValue("background-position"),
-    LEFT_TOP,
+    RIGHT_TOP,
     toolbox.id + " only contains default additional backgrounds alignment property"
   );
 

toolkit/components/extensions/test/browser/browser_ext_themes_multiple_backgrounds.js

@@ -102,7 +102,7 @@ add_task(async function test_support_backgrounds_repeat() {
                toolboxCS.backgroundImage, "The backgroundImage should use face.png three times.");
   Assert.equal(rootCS.backgroundPosition, "100% 0%",
                "The backgroundPosition should use the default value for root.");
-  Assert.equal(toolboxCS.backgroundPosition, "0% 0%",
+  Assert.equal(toolboxCS.backgroundPosition, "100% 0%",
                "The backgroundPosition should use the default value for navigator-toolbox.");
   Assert.equal(rootCS.backgroundRepeat, "no-repeat",
                "The backgroundRepeat should use the default values for root.");