Merge autoland to mozilla-central. a=merge

dom/events/test/mochitest.ini

@@ -191,6 +191,9 @@ skip-if = toolkit == 'android' # not supported
 [test_error_events.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_event_handler_cc.html]
+skip-if = 
+  os == "linux" && bits == 64 && !debug # Bug 1564622
+  win10_2004 && bits == 64 && !debug # Bug 1564622
 [test_eventctors.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_eventctors_sensors.html]

dom/workers/test/chrome.ini

@@ -74,6 +74,10 @@ skip-if = true # Frequent intermittent on QR platforms Bug 1454935
 [test_chromeWorker.xhtml]
 [test_chromeWorkerJSM.xhtml]
 [test_file.xhtml]
+skip-if =
+  os == "linux" && bits == 64 && debug # Bug 1765445
+  os == "mac" && os_version == "10.15" && !debug # Bug 1765445 
+  win10_2004 && !debug # Bug 1765445
 [test_fileBlobPosting.xhtml]
 [test_fileBlobSubWorker.xhtml]
 [test_filePosting.xhtml]

layout/generic/ScrollGeneration.h

@@ -40,8 +40,8 @@ struct ScrollGeneration {
   bool operator==(const ScrollGeneration<Tag>& aOther) const;
   bool operator!=(const ScrollGeneration<Tag>& aOther) const;
 
-  friend std::ostream& operator<<<>(std::ostream& aStream,
-                                    const ScrollGeneration<Tag>& aGen);
+  friend std::ostream& operator<< <>(std::ostream& aStream,
+                                     const ScrollGeneration<Tag>& aGen);
 
  private:
   uint64_t mValue;

layout/generic/nsSubDocumentFrame.cpp

@@ -1384,7 +1384,8 @@ bool nsDisplayRemote::CreateWebRenderCommands(
   }
 
   nscoord auPerDevPixel = pc->AppUnitsPerDevPixel();
-  nsPoint layerOffset = aDisplayListBuilder->ToReferenceFrame(mFrame) + destRect.TopLeft();
+  nsPoint layerOffset =
+      aDisplayListBuilder->ToReferenceFrame(mFrame) + destRect.TopLeft();
   mOffset = LayoutDevicePoint::FromAppUnits(layerOffset, auPerDevPixel);
 
   destRect.MoveTo(0, 0);

layout/style/nsAnimationManager.cpp

@@ -224,13 +224,12 @@ static already_AddRefed<dom::AnimationTimeline> GetTimeline(
       // We do intentionally use the pres context's document for the owner of
       // ScrollTimeline since it's consistent with what we do for
       // KeyframeEffect instance.
-      return ScrollTimeline::FromRule(*rule, aPresContext->Document(),
-                                      aTarget);
+      return ScrollTimeline::FromRule(*rule, aPresContext->Document(), aTarget);
     }
     case StyleAnimationTimeline::Tag::Scroll: {
       const auto& scroll = aStyleTimeline.AsScroll();
-      return ScrollTimeline::FromAnonymousScroll(
-          aPresContext->Document(), aTarget, scroll._0, scroll._1);
+      return ScrollTimeline::FromAnonymousScroll(aPresContext->Document(),
+                                                 aTarget, scroll._0, scroll._1);
       break;
     }
     case StyleAnimationTimeline::Tag::Auto:

layout/tables/nsTableCellFrame.cpp

@@ -1097,16 +1097,17 @@ void nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
       nsDisplayListBuilder::AutoCurrentActiveScrolledRootSetter asrSetter(
           aBuilder);
       if (IsStackingContext()) {
-	// The col/colgroup items we create below will be inserted directly into the
-	// BorderBackgrounds list of the table frame. That means that they'll be moved
-	// *outside* of any wrapper items from this table cell, and will not participate in
-	// this table cell's opacity / transform / filter / mask effects.
-	// If this cell is a stacking context, then we may have one or more of those
-	// wrapper items, and one of them may have captured a clip. In order to ensure
-	// correct clipping and scrolling of the col/colgroup items, restore the clip and ASR
-	// that we observed when we entered the table frame.
-	// If this cell is a stacking context but doesn't have any clip capturing wrapper items,
-	// then we'll double-apply the clip. That's ok.
+        // The col/colgroup items we create below will be inserted directly into
+        // the BorderBackgrounds list of the table frame. That means that
+        // they'll be moved *outside* of any wrapper items from this table cell,
+        // and will not participate in this table cell's opacity / transform /
+        // filter / mask effects. If this cell is a stacking context, then we
+        // may have one or more of those wrapper items, and one of them may have
+        // captured a clip. In order to ensure correct clipping and scrolling of
+        // the col/colgroup items, restore the clip and ASR that we observed
+        // when we entered the table frame. If this cell is a stacking context
+        // but doesn't have any clip capturing wrapper items, then we'll
+        // double-apply the clip. That's ok.
         clipState.SetClipChainForContainingBlockDescendants(
             backgrounds->GetTableClipChain());
         asrSetter.SetCurrentActiveScrolledRoot(backgrounds->GetTableASR());

toolkit/components/printing/content/printPageSetup.xhtml

@@ -5,6 +5,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet href="chrome://global/skin/printPageSetup.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -12,6 +13,7 @@
   onload="onLoad();"
   oncancel="return onCancel();"
   data-l10n-id="print-setup"
+  dialogroot="true"
   persist="screenX screenY"
   screenX="24" screenY="24">
 <dialog id="printPageSetupDialog">

toolkit/themes/shared/in-content/common-shared.css

@@ -298,6 +298,7 @@ xul|tabpanels {
   padding: 0;
   background-color: transparent;
   color: inherit;
+  color-scheme: unset;
 }
 
 xul|tabs {
@@ -316,6 +317,7 @@ xul|tab {
   background-color: transparent;
   border-bottom: 2px solid transparent;
   transition: background-color 50ms ease 0s;
+  color-scheme: unset;
 }
 
 xul|tab:hover {

toolkit/themes/windows/global/printPageSetup.css

@@ -12,11 +12,11 @@ fieldset {
   margin: 3px 3px 6px;
 }
 
-.portrait-page {
+.portrait-page .radio-icon {
   list-style-image: url("chrome://global/skin/icons/Portrait.png");
 }
 
-.landscape-page {
+.landscape-page .radio-icon {
   list-style-image: url("chrome://global/skin/icons/Landscape.png");
 }
 

toolkit/themes/windows/global/tabbox.css

@@ -15,6 +15,9 @@ tabpanels {
   -moz-default-appearance: tabpanels;
   padding: 8px;
   color: -moz-DialogText;
+  /* These don't have non-native theme support, so force them to light mode to
+   * use the native windows theme. */
+  color-scheme: light;
 }
 
 /* ::::: tab ::::: */
@@ -25,6 +28,9 @@ tab {
   margin-top: 2px;
   padding: 1px 4px 2px;
   color: -moz-DialogText;
+  /* These don't have non-native theme support, so force them to light mode to
+   * use the native windows theme. */
+  color-scheme: light;
 }
 
 tab:where([visuallyselected="true"]) {