Merge mozilla-inbound to mozilla-central a=merge

browser/base/content/browser.css

@@ -43,7 +43,7 @@
   background-repeat: var(--lwt-background-tiling);
 }
 
-#main-window:not([chromehidden~="toolbar"]) {
+:root:not([chromehidden~="toolbar"]) {
 %ifdef XP_MACOSX
   min-width: 335px;
 %else
@@ -51,7 +51,7 @@
 %endif
 }
 
-#main-window[customize-entered] {
+:root[customize-entered] {
   min-width: -moz-fit-content;
 }
 
@@ -285,12 +285,12 @@ window:not([chromehidden~="toolbar"]) #nav-bar[nonemptyoverflow] > .overflow-but
 #toolbar-menubar:not([autohide=true]) + #TabsToolbar .titlebar-spacer,
 %endif
 %ifndef MOZ_WIDGET_COCOA
-#main-window:not([sizemode=normal]) .titlebar-spacer[type="pre-tabs"],
+:root:not([sizemode=normal]) .titlebar-spacer[type="pre-tabs"],
 %endif
-#main-window:not([chromemargin]) .titlebar-buttonbox-container,
-#main-window[inFullscreen] .titlebar-buttonbox-container,
-#main-window[inFullscreen] .titlebar-spacer,
-#main-window:not([tabsintitlebar]) .titlebar-spacer {
+:root:not([chromemargin]) .titlebar-buttonbox-container,
+:root[inFullscreen] .titlebar-buttonbox-container,
+:root[inFullscreen] .titlebar-spacer,
+:root:not([tabsintitlebar]) .titlebar-spacer {
   display: none;
 }
 
@@ -304,11 +304,11 @@ window:not([chromehidden~="toolbar"]) #nav-bar[nonemptyoverflow] > .overflow-but
   -moz-window-dragging: drag;
 }
 
-#main-window[tabsintitlebar] .titlebar-buttonbox {
+:root[tabsintitlebar] .titlebar-buttonbox {
   position: relative;
 }
 
-#main-window:not([tabsintitlebar]) .titlebar-buttonbox {
+:root:not([tabsintitlebar]) .titlebar-buttonbox {
   display: none;
 }
 
@@ -352,22 +352,22 @@ toolbarpaletteitem {
 %endif
 
 %ifdef XP_WIN
-#main-window[sizemode="maximized"] #titlebar-buttonbox {
+:root[sizemode="maximized"] #titlebar-buttonbox {
   -moz-appearance: -moz-window-button-box-maximized;
 }
 
-#main-window[tabletmode] #titlebar-min,
-#main-window[tabletmode] #titlebar-max {
+:root[tabletmode] #titlebar-min,
+:root[tabletmode] #titlebar-max {
   display: none !important;
 }
 %endif
 
-#main-window[inDOMFullscreen] #navigator-toolbox,
-#main-window[inDOMFullscreen] #fullscr-toggler,
-#main-window[inDOMFullscreen] #sidebar-box,
-#main-window[inDOMFullscreen] #sidebar-splitter,
-#main-window[inFullscreen]:not([OSXLionFullscreen]) toolbar:not([fullscreentoolbar=true]),
-#main-window[inFullscreen] .global-notificationbox {
+:root[inDOMFullscreen] #navigator-toolbox,
+:root[inDOMFullscreen] #fullscr-toggler,
+:root[inDOMFullscreen] #sidebar-box,
+:root[inDOMFullscreen] #sidebar-splitter,
+:root[inFullscreen]:not([OSXLionFullscreen]) toolbar:not([fullscreentoolbar=true]),
+:root[inFullscreen] .global-notificationbox {
   visibility: collapse;
 }
 
@@ -517,7 +517,7 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
 }
 
 %ifdef XP_MACOSX
-#main-window[inFullscreen="true"] {
+:root[inFullscreen="true"] {
   padding-top: 0; /* override drawintitlebar="true" */
 }
 %endif
@@ -572,7 +572,7 @@ html|input.urlbar-input[dir=ltr]:-moz-locale-dir(rtl) {
  *
  * Attribute is controlled by browser.js:/gRemoteControl.
  */
-#main-window[remotecontrol] #urlbar {
+:root[remotecontrol] #urlbar {
   background: repeating-linear-gradient(
     -45deg,
     transparent,
@@ -582,7 +582,7 @@ html|input.urlbar-input[dir=ltr]:-moz-locale-dir(rtl) {
   background-color: rgba(255,170,68,.8);
   color: black;
 }
-#main-window[remotecontrol] #urlbar #identity-box {
+:root[remotecontrol] #urlbar #identity-box {
   background: white;
 }
 
@@ -954,7 +954,7 @@ html|*.pointerlockfswarning[ontop] {
   /* Use -10px to hide the border and border-radius on the top */
   transform: translate(-50%, -10px);
 }
-#main-window[OSXLionFullscreen] html|*.pointerlockfswarning[ontop] {
+:root[OSXLionFullscreen] html|*.pointerlockfswarning[ontop] {
   transform: translate(-50%, 80px);
 }
 
@@ -1282,8 +1282,8 @@ toolbarpaletteitem > toolbaritem {
   pointer-events: none;
 }
 
-#main-window[customizing=true] .addon-banner-item,
-#main-window[customizing=true] .panel-banner-item {
+:root[customizing=true] .addon-banner-item,
+:root[customizing=true] .panel-banner-item {
   display: none;
 }
 

browser/themes/windows/browser-aero.css

@@ -46,8 +46,8 @@
 }
 
 @media (-moz-windows-compositor) {
-  @media not all and (-moz-os-version: windows-win7) {
-    @media not all and (-moz-os-version: windows-win8) {
+  @media not (-moz-os-version: windows-win7) {
+    @media not (-moz-os-version: windows-win8) {
       @media (-moz-windows-default-theme) {
         :root:not(:-moz-lwtheme) {
           background-color: hsl(0, 0%, 78%);

browser/themes/windows/browser.css

@@ -94,7 +94,7 @@
  * illegible.
  */
 @media (-moz-windows-default-theme) {
-  @media not all and (-moz-os-version: windows-win7) {
+  @media not (-moz-os-version: windows-win7) {
     #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
       color: ThreeDShadow;
     }

browser/themes/windows/customizableui/panelUI.css

@@ -44,7 +44,7 @@ menuitem.subviewbutton[disabled]:not(.menuitem-iconic) {
 }
 
 /* Win8 and beyond. */
-@media not all and (-moz-os-version: windows-win7) {
+@media not (-moz-os-version: windows-win7) {
   #BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
   #edit-controls@inAnyPanel@,
   #zoom-controls@inAnyPanel@,

layout/generic/nsImageFrame.cpp

@@ -1648,12 +1648,11 @@ bool nsDisplayImage::CreateWebRenderCommands(
     return false;
   }
 
-  if (mFrame->IsImageFrame()) {
-    // Image layer doesn't support draw focus ring for image map.
-    nsImageFrame* f = static_cast<nsImageFrame*>(mFrame);
-    if (f->HasImageMap()) {
-      return false;
-    }
+  MOZ_ASSERT(mFrame->IsImageFrame() || mFrame->IsImageControlFrame());
+  // Image layer doesn't support draw focus ring for image map.
+  nsImageFrame* frame = static_cast<nsImageFrame*>(mFrame);
+  if (frame->HasImageMap()) {
+    return false;
   }
 
   uint32_t flags = imgIContainer::FLAG_ASYNC_NOTIFY;
@@ -1709,10 +1708,7 @@ bool nsDisplayImage::CreateWebRenderCommands(
   // display item may get recreated.
   if (updatePrevImage) {
     mPrevImage = mImage;
-    if (mFrame->IsImageFrame()) {
-      nsImageFrame* f = static_cast<nsImageFrame*>(mFrame);
-      f->mPrevImage = f->mImage;
-    }
+    frame->mPrevImage = frame->mImage;
   }
 
   // If the image container is empty, we don't want to fallback. Any other

layout/painting/nsDisplayList.cpp

@@ -4491,7 +4491,7 @@ bool nsDisplayImageContainer::CanOptimizeToImageLayer(
     return false;
   }
 
-  if (mFrame->IsImageFrame()) {
+  if (mFrame->IsImageFrame() || mFrame->IsImageControlFrame()) {
     // Image layer doesn't support draw focus ring for image map.
     nsImageFrame* f = static_cast<nsImageFrame*>(mFrame);
     if (f->HasImageMap()) {

testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini

@@ -1,3 +1,3 @@
 [client-navigate.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972

testing/web-platform/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini

@@ -1,4 +1,4 @@
 [fetch-event-respond-with-readable-stream.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
 

testing/web-platform/meta/service-workers/service-worker/import-scripts-redirect.https.html.ini

@@ -1,4 +1,4 @@
 [import-scripts-redirect.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
 

testing/web-platform/meta/service-workers/service-worker/installing.https.html.ini

@@ -1,7 +1,7 @@
 [installing.https.html]
   disabled:
     if verify: fails in verify mode
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
   [installing is set]
     expected: FAIL
 

testing/web-platform/meta/service-workers/service-worker/navigation-timing.https.html.ini

@@ -1,4 +1,4 @@
 [navigation-timing.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
 

testing/web-platform/meta/service-workers/service-worker/postmessage-to-client-message-queue.https.html.ini

@@ -1,4 +1,4 @@
 [postmessage-to-client-message-queue.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
 

testing/web-platform/meta/service-workers/service-worker/postmessage.https.html.ini

@@ -1,3 +1,3 @@
 [postmessage.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972

testing/web-platform/meta/service-workers/service-worker/unregister-then-register.https.html.ini

@@ -1,4 +1,4 @@
 [unregister-then-register.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
 

testing/web-platform/meta/service-workers/service-worker/unregister.https.html.ini

@@ -1,3 +1,3 @@
 [unregister.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972

testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini

@@ -1,4 +1,4 @@
 [update-not-allowed.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
 

testing/web-platform/meta/service-workers/service-worker/update-registration-with-type.https.html.ini

@@ -1,6 +1,6 @@
 [update-registration-with-type.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
   [Update the registration with a different script type (module => classic).]
     expected: FAIL
 

testing/web-platform/meta/user-timing/measure_associated_with_navigation_timing.html.ini

@@ -1,4 +1,4 @@
 [measure_associated_with_navigation_timing.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1461298