Bug 1291268 - HiDPI image are missing from video controls on Windows and Linux. r?ralin draft
authorJared Wein <jwein@mozilla.com>
Tue, 02 Aug 2016 09:33:44 -0400
changeset 395488 82f2fe136644ff2fa5b8b6925aa7e83ab07ccdad
parent 395061 3bc5415cc37d7c06e509cb49f5d4003481d49d15
child 527014 b7aded7de51538edd59f8e3f8a03b9b9f6f0ec61
push id24795
push userjwein@mozilla.com
push dateTue, 02 Aug 2016 13:34:59 +0000
reviewersralin
bugs1291268
milestone50.0a1
Bug 1291268 - HiDPI image are missing from video controls on Windows and Linux. r?ralin MozReview-Commit-ID: 9fEvJaoveny
toolkit/themes/osx/global/jar.mn
toolkit/themes/osx/global/media/TopLevelImageDocument.css
toolkit/themes/osx/global/media/TopLevelVideoDocument.css
toolkit/themes/osx/global/media/clicktoplay-bgtexture.png
toolkit/themes/osx/global/media/closeCaptionButton.png
toolkit/themes/osx/global/media/closeCaptionButton@2x.png
toolkit/themes/osx/global/media/error.png
toolkit/themes/osx/global/media/fullscreenButton.png
toolkit/themes/osx/global/media/fullscreenButton@2x.png
toolkit/themes/osx/global/media/imagedoc-darknoise.png
toolkit/themes/osx/global/media/imagedoc-lightnoise.png
toolkit/themes/osx/global/media/muteButton.png
toolkit/themes/osx/global/media/muteButton@2x.png
toolkit/themes/osx/global/media/noAudio.png
toolkit/themes/osx/global/media/noAudio@2x.png
toolkit/themes/osx/global/media/pauseButton.png
toolkit/themes/osx/global/media/pauseButton@2x.png
toolkit/themes/osx/global/media/playButton.png
toolkit/themes/osx/global/media/playButton@2x.png
toolkit/themes/osx/global/media/scrubberThumb.png
toolkit/themes/osx/global/media/scrubberThumb@2x.png
toolkit/themes/osx/global/media/scrubberThumbWide.png
toolkit/themes/osx/global/media/scrubberThumbWide@2x.png
toolkit/themes/osx/global/media/stalled.png
toolkit/themes/osx/global/media/throbber.png
toolkit/themes/osx/global/media/unmuteButton.png
toolkit/themes/osx/global/media/unmuteButton@2x.png
toolkit/themes/osx/global/media/videoClickToPlayButton.svg
toolkit/themes/osx/global/media/videocontrols.css
toolkit/themes/osx/global/media/volume-empty.png
toolkit/themes/osx/global/media/volume-empty@2x.png
toolkit/themes/osx/global/media/volume-full.png
toolkit/themes/osx/global/media/volume-full@2x.png
toolkit/themes/shared/jar.inc.mn
toolkit/themes/shared/media/TopLevelImageDocument.css
toolkit/themes/shared/media/TopLevelVideoDocument.css
toolkit/themes/shared/media/clicktoplay-bgtexture.png
toolkit/themes/shared/media/closeCaptionButton.png
toolkit/themes/shared/media/closeCaptionButton@2x.png
toolkit/themes/shared/media/error.png
toolkit/themes/shared/media/fullscreenButton.png
toolkit/themes/shared/media/fullscreenButton@2x.png
toolkit/themes/shared/media/imagedoc-darknoise.png
toolkit/themes/shared/media/imagedoc-lightnoise.png
toolkit/themes/shared/media/muteButton.png
toolkit/themes/shared/media/muteButton@2x.png
toolkit/themes/shared/media/noAudio.png
toolkit/themes/shared/media/noAudio@2x.png
toolkit/themes/shared/media/pauseButton.png
toolkit/themes/shared/media/pauseButton@2x.png
toolkit/themes/shared/media/playButton.png
toolkit/themes/shared/media/playButton@2x.png
toolkit/themes/shared/media/scrubberThumb.png
toolkit/themes/shared/media/scrubberThumb@2x.png
toolkit/themes/shared/media/scrubberThumbWide.png
toolkit/themes/shared/media/scrubberThumbWide@2x.png
toolkit/themes/shared/media/stalled.png
toolkit/themes/shared/media/throbber.png
toolkit/themes/shared/media/unmuteButton.png
toolkit/themes/shared/media/unmuteButton@2x.png
toolkit/themes/shared/media/videoClickToPlayButton.svg
toolkit/themes/shared/media/videocontrols.css
toolkit/themes/shared/media/volume-empty.png
toolkit/themes/shared/media/volume-empty@2x.png
toolkit/themes/shared/media/volume-full.png
toolkit/themes/shared/media/volume-full@2x.png
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/windows/global/media/TopLevelImageDocument.css
toolkit/themes/windows/global/media/TopLevelVideoDocument.css
toolkit/themes/windows/global/media/clicktoplay-bgtexture.png
toolkit/themes/windows/global/media/closeCaptionButton.png
toolkit/themes/windows/global/media/closeCaptionButton@2x.png
toolkit/themes/windows/global/media/error.png
toolkit/themes/windows/global/media/fullscreenButton.png
toolkit/themes/windows/global/media/imagedoc-darknoise.png
toolkit/themes/windows/global/media/imagedoc-lightnoise.png
toolkit/themes/windows/global/media/muteButton.png
toolkit/themes/windows/global/media/noAudio.png
toolkit/themes/windows/global/media/pauseButton.png
toolkit/themes/windows/global/media/playButton.png
toolkit/themes/windows/global/media/scrubberThumb.png
toolkit/themes/windows/global/media/scrubberThumbWide.png
toolkit/themes/windows/global/media/stalled.png
toolkit/themes/windows/global/media/throbber.png
toolkit/themes/windows/global/media/unmuteButton.png
toolkit/themes/windows/global/media/videoClickToPlayButton.svg
toolkit/themes/windows/global/media/videocontrols.css
toolkit/themes/windows/global/media/volume-empty.png
toolkit/themes/windows/global/media/volume-full.png
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -122,48 +122,16 @@ toolkit.jar:
   skin/classic/global/icons/question-32.png                          (icons/question-32.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/question-large.png                       (icons/question-large.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
   skin/classic/global/notification/close.png                         (notification/close.png)
   skin/classic/global/notification/error-icon.png                    (notification/error-icon.png)
   skin/classic/global/notification/info-icon.png                     (notification/info-icon.png)
   skin/classic/global/notification/warning-icon.png                  (notification/warning-icon.png)
-  skin/classic/global/media/TopLevelImageDocument.css                (media/TopLevelImageDocument.css)
-  skin/classic/global/media/TopLevelVideoDocument.css                (media/TopLevelVideoDocument.css)
-  skin/classic/global/media/imagedoc-lightnoise.png                  (media/imagedoc-lightnoise.png)
-  skin/classic/global/media/imagedoc-darknoise.png                   (media/imagedoc-darknoise.png)
-  skin/classic/global/media/videocontrols.css                        (media/videocontrols.css)
-  skin/classic/global/media/pauseButton.png                          (media/pauseButton.png)
-  skin/classic/global/media/pauseButton@2x.png                       (media/pauseButton@2x.png)
-  skin/classic/global/media/playButton.png                           (media/playButton.png)
-  skin/classic/global/media/playButton@2x.png                        (media/playButton@2x.png)
-  skin/classic/global/media/muteButton.png                           (media/muteButton.png)
-  skin/classic/global/media/muteButton@2x.png                        (media/muteButton@2x.png)
-  skin/classic/global/media/unmuteButton.png                         (media/unmuteButton.png)
-  skin/classic/global/media/unmuteButton@2x.png                      (media/unmuteButton@2x.png)
-  skin/classic/global/media/noAudio.png                              (media/noAudio.png)
-  skin/classic/global/media/noAudio@2x.png                           (media/noAudio@2x.png)
-  skin/classic/global/media/closeCaptionButton.png                   (media/closeCaptionButton.png)
-  skin/classic/global/media/closeCaptionButton@2x.png                (media/closeCaptionButton@2x.png)
-  skin/classic/global/media/fullscreenButton.png                     (media/fullscreenButton.png)
-  skin/classic/global/media/fullscreenButton@2x.png                  (media/fullscreenButton@2x.png)
-  skin/classic/global/media/scrubberThumb.png                        (media/scrubberThumb.png)
-  skin/classic/global/media/scrubberThumb@2x.png                     (media/scrubberThumb@2x.png)
-  skin/classic/global/media/scrubberThumbWide.png                    (media/scrubberThumbWide.png)
-  skin/classic/global/media/scrubberThumbWide@2x.png                 (media/scrubberThumbWide@2x.png)
-  skin/classic/global/media/error.png                                (media/error.png)
-  skin/classic/global/media/throbber.png                             (media/throbber.png)
-  skin/classic/global/media/stalled.png                              (media/stalled.png)
-  skin/classic/global/media/volume-empty.png                         (media/volume-empty.png)
-  skin/classic/global/media/volume-empty@2x.png                      (media/volume-empty@2x.png)
-  skin/classic/global/media/volume-full.png                          (media/volume-full.png)
-  skin/classic/global/media/volume-full@2x.png                       (media/volume-full@2x.png)
-  skin/classic/global/media/clicktoplay-bgtexture.png                (media/clicktoplay-bgtexture.png)
-  skin/classic/global/media/videoClickToPlayButton.svg               (media/videoClickToPlayButton.svg)
 * skin/classic/global/in-content/common.css                          (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css                      (in-content/info-pages.css)
   skin/classic/global/scale/scale-tray-horiz.gif                     (scale/scale-tray-horiz.gif)
   skin/classic/global/scale/scale-tray-vert.gif                      (scale/scale-tray-vert.gif)
   skin/classic/global/splitter/dimple.png                            (splitter/dimple.png)
   skin/classic/global/splitter/grip-bottom.gif                       (splitter/grip-bottom.gif)
   skin/classic/global/splitter/grip-top.gif                          (splitter/grip-top.gif)
   skin/classic/global/splitter/grip-left.gif                         (splitter/grip-left.gif)
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -52,14 +52,46 @@ toolkit.jar:
   skin/classic/global/reader/RM-Minus-24x24.svg            (../../shared/reader/RM-Minus-24x24.svg)
   skin/classic/global/reader/RM-Plus-24x24.svg             (../../shared/reader/RM-Plus-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-24x24.svg    (../../shared/reader/RM-Type-Controls-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-Arrow.svg    (../../shared/reader/RM-Type-Controls-Arrow.svg)
   skin/classic/global/reader/RM-Content-Width-Minus-42x16.svg            (../../shared/reader/RM-Content-Width-Minus-42x16.svg)
   skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg             (../../shared/reader/RM-Content-Width-Plus-44x16.svg)
   skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg            (../../shared/reader/RM-Line-Height-Minus-38x14.svg)
   skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg             (../../shared/reader/RM-Line-Height-Plus-38x24.svg)
+  skin/classic/global/media/TopLevelImageDocument.css      (../../shared/media/TopLevelImageDocument.css)
+  skin/classic/global/media/TopLevelVideoDocument.css      (../../shared/media/TopLevelVideoDocument.css)
+  skin/classic/global/media/imagedoc-lightnoise.png        (../../shared/media/imagedoc-lightnoise.png)
+  skin/classic/global/media/imagedoc-darknoise.png         (../../shared/media/imagedoc-darknoise.png)
+* skin/classic/global/media/videocontrols.css              (../../shared/media/videocontrols.css)
+  skin/classic/global/media/pauseButton.png                (../../shared/media/pauseButton.png)
+  skin/classic/global/media/pauseButton@2x.png             (../../shared/media/pauseButton@2x.png)
+  skin/classic/global/media/playButton.png                 (../../shared/media/playButton.png)
+  skin/classic/global/media/playButton@2x.png              (../../shared/media/playButton@2x.png)
+  skin/classic/global/media/muteButton.png                 (../../shared/media/muteButton.png)
+  skin/classic/global/media/muteButton@2x.png              (../../shared/media/muteButton@2x.png)
+  skin/classic/global/media/unmuteButton.png               (../../shared/media/unmuteButton.png)
+  skin/classic/global/media/unmuteButton@2x.png            (../../shared/media/unmuteButton@2x.png)
+  skin/classic/global/media/noAudio.png                    (../../shared/media/noAudio.png)
+  skin/classic/global/media/noAudio@2x.png                 (../../shared/media/noAudio@2x.png)
+  skin/classic/global/media/closeCaptionButton.png         (../../shared/media/closeCaptionButton.png)
+  skin/classic/global/media/closeCaptionButton@2x.png      (../../shared/media/closeCaptionButton@2x.png)
+  skin/classic/global/media/fullscreenButton.png           (../../shared/media/fullscreenButton.png)
+  skin/classic/global/media/fullscreenButton@2x.png        (../../shared/media/fullscreenButton@2x.png)
+  skin/classic/global/media/scrubberThumb.png              (../../shared/media/scrubberThumb.png)
+  skin/classic/global/media/scrubberThumb@2x.png           (../../shared/media/scrubberThumb@2x.png)
+  skin/classic/global/media/scrubberThumbWide.png          (../../shared/media/scrubberThumbWide.png)
+  skin/classic/global/media/scrubberThumbWide@2x.png       (../../shared/media/scrubberThumbWide@2x.png)
+  skin/classic/global/media/error.png                      (../../shared/media/error.png)
+  skin/classic/global/media/throbber.png                   (../../shared/media/throbber.png)
+  skin/classic/global/media/stalled.png                    (../../shared/media/stalled.png)
+  skin/classic/global/media/volume-empty.png               (../../shared/media/volume-empty.png)
+  skin/classic/global/media/volume-empty@2x.png            (../../shared/media/volume-empty@2x.png)
+  skin/classic/global/media/volume-full.png                (../../shared/media/volume-full.png)
+  skin/classic/global/media/volume-full@2x.png             (../../shared/media/volume-full@2x.png)
+  skin/classic/global/media/clicktoplay-bgtexture.png      (../../shared/media/clicktoplay-bgtexture.png)
+  skin/classic/global/media/videoClickToPlayButton.svg     (../../shared/media/videoClickToPlayButton.svg)
 #ifdef MOZ_PLACES
   skin/classic/mozapps/places/defaultFavicon.png           (../../shared/places/defaultFavicon.png)
   skin/classic/mozapps/places/defaultFavicon@2x.png        (../../shared/places/defaultFavicon@2x.png)
   skin/classic/mozapps/places/defaultFavicon-inverted.png  (../../shared/places/defaultFavicon-inverted.png)
   skin/classic/mozapps/places/defaultFavicon-inverted@2x.png (../../shared/places/defaultFavicon-inverted@2x.png)
 #endif
rename from toolkit/themes/osx/global/media/TopLevelImageDocument.css
rename to toolkit/themes/shared/media/TopLevelImageDocument.css
rename from toolkit/themes/osx/global/media/TopLevelVideoDocument.css
rename to toolkit/themes/shared/media/TopLevelVideoDocument.css
rename from toolkit/themes/osx/global/media/clicktoplay-bgtexture.png
rename to toolkit/themes/shared/media/clicktoplay-bgtexture.png
rename from toolkit/themes/osx/global/media/closeCaptionButton.png
rename to toolkit/themes/shared/media/closeCaptionButton.png
rename from toolkit/themes/osx/global/media/closeCaptionButton@2x.png
rename to toolkit/themes/shared/media/closeCaptionButton@2x.png
rename from toolkit/themes/osx/global/media/error.png
rename to toolkit/themes/shared/media/error.png
rename from toolkit/themes/osx/global/media/fullscreenButton.png
rename to toolkit/themes/shared/media/fullscreenButton.png
rename from toolkit/themes/osx/global/media/fullscreenButton@2x.png
rename to toolkit/themes/shared/media/fullscreenButton@2x.png
rename from toolkit/themes/osx/global/media/imagedoc-darknoise.png
rename to toolkit/themes/shared/media/imagedoc-darknoise.png
rename from toolkit/themes/osx/global/media/imagedoc-lightnoise.png
rename to toolkit/themes/shared/media/imagedoc-lightnoise.png
rename from toolkit/themes/osx/global/media/muteButton.png
rename to toolkit/themes/shared/media/muteButton.png
rename from toolkit/themes/osx/global/media/muteButton@2x.png
rename to toolkit/themes/shared/media/muteButton@2x.png
rename from toolkit/themes/osx/global/media/noAudio.png
rename to toolkit/themes/shared/media/noAudio.png
rename from toolkit/themes/osx/global/media/noAudio@2x.png
rename to toolkit/themes/shared/media/noAudio@2x.png
rename from toolkit/themes/osx/global/media/pauseButton.png
rename to toolkit/themes/shared/media/pauseButton.png
rename from toolkit/themes/osx/global/media/pauseButton@2x.png
rename to toolkit/themes/shared/media/pauseButton@2x.png
rename from toolkit/themes/osx/global/media/playButton.png
rename to toolkit/themes/shared/media/playButton.png
rename from toolkit/themes/osx/global/media/playButton@2x.png
rename to toolkit/themes/shared/media/playButton@2x.png
rename from toolkit/themes/osx/global/media/scrubberThumb.png
rename to toolkit/themes/shared/media/scrubberThumb.png
rename from toolkit/themes/osx/global/media/scrubberThumb@2x.png
rename to toolkit/themes/shared/media/scrubberThumb@2x.png
rename from toolkit/themes/osx/global/media/scrubberThumbWide.png
rename to toolkit/themes/shared/media/scrubberThumbWide.png
rename from toolkit/themes/osx/global/media/scrubberThumbWide@2x.png
rename to toolkit/themes/shared/media/scrubberThumbWide@2x.png
rename from toolkit/themes/osx/global/media/stalled.png
rename to toolkit/themes/shared/media/stalled.png
rename from toolkit/themes/osx/global/media/throbber.png
rename to toolkit/themes/shared/media/throbber.png
rename from toolkit/themes/osx/global/media/unmuteButton.png
rename to toolkit/themes/shared/media/unmuteButton.png
rename from toolkit/themes/osx/global/media/unmuteButton@2x.png
rename to toolkit/themes/shared/media/unmuteButton@2x.png
rename from toolkit/themes/osx/global/media/videoClickToPlayButton.svg
rename to toolkit/themes/shared/media/videoClickToPlayButton.svg
rename from toolkit/themes/osx/global/media/videocontrols.css
rename to toolkit/themes/shared/media/videocontrols.css
--- a/toolkit/themes/osx/global/media/videocontrols.css
+++ b/toolkit/themes/shared/media/videocontrols.css
@@ -154,21 +154,30 @@
 
 .durationBox {
   -moz-box-pack: center;
 }
 
 .durationLabel {
   margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */
   padding-left: 8px; /* don't bump into the scrubber bar */
-  padding-top: 2px; /* center vertically with scrubber bar */
   color: rgba(255,255,255,.75);
+  font: message-box;
   font-size: 11px;
-  font-family: Helvetica, sans-serif;
+}
+
+%ifdef XP_MACOSX
+.durationLabel {
+  padding-top: 2px; /* center vertically with scrubber bar */
 }
+%else
+.durationLabel {
+  padding-top: 0; /* center vertically with scrubber bar */
+}
+%endif
 
 .positionLabel {
   display: none;
 }
 
 .backgroundBar {
   /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
   /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
@@ -178,33 +187,38 @@
 }
 
 .bufferBar,
 .progressBar {
   /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
   /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
   margin: 10px 22px;
   -moz-appearance: none;
+  border: none;
+  background-color: transparent;
   min-width: 0;
+  min-height: 0;
 }
 
 /* .progress-bar is an element inside the <progressmeter> implementation. */
 .bufferBar .progress-bar {
   /*
    * Note that this is drawn on top of the .backgroundBar. So although this
    * has the same background-color specified, the semitransparent
    * compositing gives it a different visual appearance.
    */
   background-color: rgba(255,255,255,.5);
   border-radius: 2.5px;
+  -moz-appearance: none;
 }
 
 .progressBar .progress-bar {
   background-color: white;
   border-radius: 2.5px;
+  -moz-appearance: none;
 }
 
 /* .scale-slider is an element inside the <scale> implementation. */
 .scrubber .scale-slider,
 .volumeControl .scale-slider {
   /* Hide the default horizontal bar. */
   -moz-appearance: none;
   background: none;
@@ -212,17 +226,18 @@
 }
 
 .scrubber .scale-slider {
   /* abs(margin-top) + margin-bottom + bar height == timeThumb height */
   margin-top: -10px;
   margin-bottom: 10px;
 }
 /* .scale-thumb is an element inside the <scale> implementation. */
-.scrubber .scale-thumb {
+.scrubber .scale-thumb,
+.volumeControl .scale-thumb {
   /* Override the default thumb appearance with a custom image. */
   -moz-appearance: none;
   background: transparent;
   border: none;
 }
 
 .timeThumb {
   background: url(chrome://global/skin/media/scrubberThumb.png) no-repeat center;
@@ -232,22 +247,32 @@
 }
 
 .timeThumb[showhours="true"] {
   background-image: url(chrome://global/skin/media/scrubberThumbWide.png);
 }
 
 .timeLabel {
   color: rgba(255,255,255,.75);
+  font: message-box;
   font-size: 10px;
-  font-family: Helvetica, sans-serif;
   text-shadow: rgba(0,0,0,.3) 0 1px;
   padding-top: 7px;
 }
 
+%ifdef XP_MACOSX
+.timeLabel {
+  padding-top: 7px; /* center vertically with scrubber bar */
+}
+%else
+.timeLabel {
+  padding-top: 5px; /* center vertically with scrubber bar */
+}
+%endif
+
 .statusOverlay {
   -moz-box-align: center;
   -moz-box-pack: center;
   background-color: rgba(0,0,0,.55);
 }
 
 .statusIcon {
   margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */
@@ -385,17 +410,17 @@ html|table {
   .muteButton[muted] {
     background-image: url(chrome://global/skin/media/unmuteButton@2x.png);
     background-size: 33px 28px;
   }
   .muteButton[noAudio] {
     background-image: url(chrome://global/skin/media/noAudio@2x.png);
     background-size: 33px 28px;
   }
-  .closeCaptionButton {
+  .closedCaptionButton {
     background-image: url(chrome://global/skin/media/closeCaptionButton@2x.png);
     background-size: 28px 28px;
   }
   .fullscreenButton {
     background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 32, 32, 0);
     background-size: 16px 16px;
   }
   .fullscreenButton[fullscreened] {
rename from toolkit/themes/osx/global/media/volume-empty.png
rename to toolkit/themes/shared/media/volume-empty.png
rename from toolkit/themes/osx/global/media/volume-empty@2x.png
rename to toolkit/themes/shared/media/volume-empty@2x.png
rename from toolkit/themes/osx/global/media/volume-full.png
rename to toolkit/themes/shared/media/volume-full.png
rename from toolkit/themes/osx/global/media/volume-full@2x.png
rename to toolkit/themes/shared/media/volume-full@2x.png
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -83,38 +83,16 @@
   skin/classic/global/icons/Search-close.png               (../../windows/global/icons/Search-close.png)
   skin/classic/global/icons/Search-glass.png               (../../windows/global/icons/Search-glass.png)
   skin/classic/global/icons/tabprompts-bgtexture.png       (../../windows/global/icons/tabprompts-bgtexture.png)
   skin/classic/global/icons/Warning.png                    (../../windows/global/icons/Warning.png)
   skin/classic/global/icons/warning-large.png              (../../windows/global/icons/warning-large.png)
   skin/classic/global/icons/warning-16.png                 (../../windows/global/icons/warning-16.png)
   skin/classic/global/icons/warning-64.png                 (../../windows/global/icons/warning-64.png)
   skin/classic/global/icons/windowControls.png             (../../windows/global/icons/windowControls.png)
-  skin/classic/global/media/TopLevelImageDocument.css      (../../windows/global/media/TopLevelImageDocument.css)
-  skin/classic/global/media/TopLevelVideoDocument.css      (../../windows/global/media/TopLevelVideoDocument.css)
-  skin/classic/global/media/imagedoc-lightnoise.png        (../../windows/global/media/imagedoc-lightnoise.png)
-  skin/classic/global/media/imagedoc-darknoise.png         (../../windows/global/media/imagedoc-darknoise.png)
-  skin/classic/global/media/videocontrols.css              (../../windows/global/media/videocontrols.css)
-  skin/classic/global/media/pauseButton.png                (../../windows/global/media/pauseButton.png)
-  skin/classic/global/media/playButton.png                 (../../windows/global/media/playButton.png)
-  skin/classic/global/media/muteButton.png                 (../../windows/global/media/muteButton.png)
-  skin/classic/global/media/unmuteButton.png               (../../windows/global/media/unmuteButton.png)
-  skin/classic/global/media/noAudio.png                    (../../windows/global/media/noAudio.png)
-  skin/classic/global/media/closeCaptionButton.png         (../../windows/global/media/closeCaptionButton.png)
-  skin/classic/global/media/closeCaptionButton@2x.png      (../../windows/global/media/closeCaptionButton@2x.png)
-  skin/classic/global/media/fullscreenButton.png           (../../windows/global/media/fullscreenButton.png)
-  skin/classic/global/media/scrubberThumb.png              (../../windows/global/media/scrubberThumb.png)
-  skin/classic/global/media/scrubberThumbWide.png          (../../windows/global/media/scrubberThumbWide.png)
-  skin/classic/global/media/throbber.png                   (../../windows/global/media/throbber.png)
-  skin/classic/global/media/stalled.png                    (../../windows/global/media/stalled.png)
-  skin/classic/global/media/volume-empty.png               (../../windows/global/media/volume-empty.png)
-  skin/classic/global/media/volume-full.png                (../../windows/global/media/volume-full.png)
-  skin/classic/global/media/error.png                      (../../windows/global/media/error.png)
-  skin/classic/global/media/clicktoplay-bgtexture.png      (../../windows/global/media/clicktoplay-bgtexture.png)
-  skin/classic/global/media/videoClickToPlayButton.svg     (../../windows/global/media/videoClickToPlayButton.svg)
   skin/classic/global/printpreview/arrow-left.png          (../../windows/global/printpreview/arrow-left.png)
   skin/classic/global/printpreview/arrow-left-end.png      (../../windows/global/printpreview/arrow-left-end.png)
   skin/classic/global/printpreview/arrow-right.png         (../../windows/global/printpreview/arrow-right.png)
   skin/classic/global/printpreview/arrow-right-end.png     (../../windows/global/printpreview/arrow-right-end.png)
   skin/classic/global/radio/radio-check.gif                (../../windows/global/radio/radio-check.gif)
   skin/classic/global/radio/radio-check-dis.gif            (../../windows/global/radio/radio-check-dis.gif)
   skin/classic/global/scrollbar/slider.gif                 (../../windows/global/scrollbar/slider.gif)
   skin/classic/global/splitter/grip-bottom.gif             (../../windows/global/splitter/grip-bottom.gif)
deleted file mode 100644
--- a/toolkit/themes/windows/global/media/TopLevelImageDocument.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 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/. */
-
-@media not print {
-  /* N.B.: Remember to update ImageDocument.css in the tree or reftests may fail! */
-
-  body {
-    color: #eee;
-    background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
-  }
-
-  img.transparent {
-    background: hsl(0,0%,90%) url("chrome://global/skin/media/imagedoc-lightnoise.png");
-    color: #222;
-  }
-}
deleted file mode 100644
--- a/toolkit/themes/windows/global/media/TopLevelVideoDocument.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 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/. */
-
-body {
-  background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
-  background-color: rgb(33,33,33); /* Average color of that ^ image. */
-}
-
-video {
-  box-shadow: 0 0 15px #000;
-}
deleted file mode 100644
index 0d3cacd1175b8ceb1bc41a863c2cf0a30285de67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 469310fb1b21ed705925decd18710dd0df37d915..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 03350789221b94d830ebc4dafb1b6e4447f79f71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 58e37283a73eff086420d0969544fa8bc5dd7924..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ffbc3d5ae4627d9beb7c4e8c6ef80542e7e1414c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5c33e24d4c1b123c46d6e89e0adec137bfd4da0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3467cf4d4701c6623125a8ecf80a833c6a0afca3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 894480761d0742015ffcfcc2d28bc10e88cbe4a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3db8c973b6594cb8820661564eb8dacb673c09b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 944098ca19a4f63331ae852606c3907285e7e203..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 11e2731df64f9dd00623f263150d8a651ee1b1bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f159627631c536f0def829f45f3715f198db1a5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 96d2ed75140584a92940e65b4f5d1f7a60a133c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 525375889b267423632f7049b080c6c03c8cd609..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8e49fe5b2acbb16b54acae902cc89c4050896517..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5b76e2fa45d8481ca0a81e524c4a20508adfc284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/themes/windows/global/media/videoClickToPlayButton.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet" viewBox="0 0 64 64">
-  <defs>
-    <linearGradient id="whiteGradientStops">
-      <stop style="stop-color:#fff;stop-opacity:.95" offset="0"/>
-      <stop style="stop-color:#fff;stop-opacity:.75" offset=".45"/>
-      <stop style="stop-color:#fff;stop-opacity:.72" offset=".55"/>
-      <stop style="stop-color:#fff;stop-opacity:.65" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="32" y1="0" x2="32" y2="62" id="whiteGradient" xlink:href="#whiteGradientStops" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="arrowGradientStops">
-      <stop style="stop-color:#333;stop-opacity:.5" offset="0"/>
-      <stop style="stop-color:#666;stop-opacity:.5" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="32" y1="16" x2="32" y2="48" id="arrowGradient" xlink:href="#arrowGradientStops" gradientUnits="userSpaceOnUse"/>
-    <filter x="-0.15" y="-0.15" width="1.25" height="1.25" color-interpolation-filters="sRGB" id="dropShadow">
-      <feDropShadow dx="0" dy="1" flood-opacity="0.5"/>
-    </filter>
-    <mask id="dropShadowMask">
-      <path style="fill:#fff;" d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"/>
-    </mask>
-  </defs>
-  <path mask="url(#dropShadowMask)" id="playButtonShadow" style="filter:url(#dropShadow);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
-  <path id="playButtonArrow" style="fill:url(#arrowGradient);" d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"/>
-  <path id="playButton" style="fill:url(#whiteGradient);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
-  <path id="playButtonEdgeHighlights" style="fill:white;fill-opacity:.3;" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"/>
-  <path id="playButtonTopEdgeHighlights" style="fill:white;fill-opacity:.8;" d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"/>
-</svg>
deleted file mode 100644
--- a/toolkit/themes/windows/global/media/videocontrols.css
+++ /dev/null
@@ -1,369 +0,0 @@
-/* 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.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-.controlBar {
-  height: 28px;
-  background-color: rgba(35,31,32,.74);
-}
-
-.playButton,
-.muteButton,
-.closedCaptionButton,
-.fullscreenButton {
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-position: center;
-  -moz-appearance: none;   /* Remove the native button appearance and styling */
-  margin: 0;
-  padding: 0;
-  min-height: 28px;
-  min-width: 28px;
-  border: none;
-  opacity: 0.7;
-}
-
-.playButton:hover,
-.muteButton:hover,
-.closedCaptionButton:hover,
-.fullscreenButton:hover {
-  opacity: 1;
-}
-
-.playButton:hover:active,
-.muteButton:hover:active,
-.closedCaptionButton:hover:active,
-.fullscreenButton:hover:active {
-  opacity: 0.4;
-}
-
-.playButton {
-  background-image: url(chrome://global/skin/media/pauseButton.png);
-  margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */
-  position: relative; /* Trick to work around negative margin interfering with clicking on the button. */
-}
-
-.playButton[paused] {
-  background-image: url(chrome://global/skin/media/playButton.png);
-}
-
-.muteButton {
-  background-image: url(chrome://global/skin/media/muteButton.png);
-  min-width: 33px;
-}
-.muteButton[muted] {
-  background-image: url(chrome://global/skin/media/unmuteButton.png);
-}
-
-.muteButton[noAudio] {
-  background-image: url(chrome://global/skin/media/noAudio.png);
-}
-
-.muteButton[noAudio] + .volumeStack {
-  display: none;
-}
-
-.closedCaptionButton {
-  background-image: url(chrome://global/skin/media/closeCaptionButton.png);
-}
-
-.closedCaptionButton[enabled] {
-  opacity: 1;
-}
-
-.closedCaptionButton[hidden] {
-  display: none;
-}
-
-.fullscreenButton {
-  background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0);
-}
-
-.fullscreenButton[fullscreened] {
-  background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16);
-}
-
-.volumeControl {
-  width: 32px;
-  opacity: 0;
-}
-
-.volumeBackground,
-.volumeForeground {
-  background-repeat: no-repeat;
-  background-position: center;
-  width: 32px;
-}
-
-.volumeBackground {
-  background-image: url(chrome://global/skin/media/volume-empty.png);
-}
-
-.volumeForeground {
-  background-image: url(chrome://global/skin/media/volume-full.png);
-  background-clip: content-box;
-}
-
-.textTrackList {
-  display: -moz-box;
-  -moz-appearance: none;
-  -moz-box-pack: end;
-  -moz-box-align: end;
-  padding: 0;
-}
-
-.textTrackList[hidden] {
-  display: none;
-}
-
-.textTrackList > html|*.textTrackItem {
-  -moz-appearance: none;
-  -moz-box-align: start;
-  text-align: start;
-  overflow: hidden;
-  margin: 0;
-  padding: 2px 10px;
-  -moz-margin-end: 10px;
-  border: none;
-  color: rgba(255,255,255,.5);
-  background-color: rgba(35,31,32,.74);
-  white-space: nowrap;
-}
-
-.textTrackList > html|*.textTrackItem[on] {
-  color: white;
-  background-color: black;
-}
-
-.textTrackList > html|*.textTrackItem:hover {
-  background-color: rgba(0,0,0,.55);
-}
-
-.controlBar[fullscreen-unavailable] > .volumeStack {
-  /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
-  margin-inline-end: 8px;
-}
-
-.volumeControl .scale-thumb {
-  min-width: 0;
-  opacity: 0;
-}
-
-.durationBox {
-  -moz-box-pack: center;
-}
-
-.durationLabel {
-  margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */
-  padding-left: 8px; /* don't bump into the scrubber bar */
-  padding-top: 0; /* center vertically with scrubber bar */
-  color: rgba(255,255,255,.75);
-  font-size: 11px;
-  font-family: Arial, sans-serif;
-}
-
-.positionLabel {
-  display: none;
-}
-
-.backgroundBar {
-  /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
-  /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
-  margin: 10px 22px;
-  background-color: rgba(255,255,255,.5);
-  border-radius: 2.5px;
-}
-
-.bufferBar,
-.progressBar {
-  /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
-  /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
-  margin: 10px 22px;
-  -moz-appearance: none;
-  border: none;
-  background-color: transparent;
-  min-width: 0;
-  min-height: 0;
-}
-
-/* .progress-bar is an element inside the <progressmeter> implementation. */
-.bufferBar .progress-bar {
-  /*
-   * Note that this is drawn on top of the .backgroundBar. So although this
-   * has the same background-color specified, the semitransparent
-   * compositing gives it a different visual appearance.
-   */
-  background-color: rgba(255,255,255,.5);
-  border-radius: 2.5px;
-  -moz-appearance: none;
-}
-
-.progressBar .progress-bar {
-  background-color: white;
-  border-radius: 2.5px;
-  -moz-appearance: none;
-}
-
-/* .scale-slider is an element inside the <scale> implementation. */
-.scrubber .scale-slider,
-.volumeControl .scale-slider {
-  /* Hide the default horizontal bar. */
-  -moz-appearance: none;
-  background: none;
-  margin: 0;
-}
-
-.scrubber .scale-slider {
-  /* abs(margin-top) + margin-bottom + bar height == timeThumb height */
-  margin-top: -10px;
-  margin-bottom: 10px;
-}
-
-/* .scale-thumb is an element inside the <scale> implementation. */
-.scrubber .scale-thumb,
-.volumeControl .scale-thumb {
-  /* Override the default thumb appearance with a custom image. */
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-}
-
-.timeThumb {
-  background: url(chrome://global/skin/media/scrubberThumb.png) no-repeat center;
-  min-width: 45px;
-  min-height: 28px;
-  -moz-box-pack: center;
-}
-
-.timeThumb[showhours="true"] {
-  background-image: url(chrome://global/skin/media/scrubberThumbWide.png);
-}
-
-.timeLabel {
-  color: rgba(255,255,255,.75);
-  font-size: 10px;
-  font-family: Arial, sans-serif;
-  text-shadow: rgba(0,0,0,.3) 0 1px;
-  padding-top: 5px;
-}
-
-.statusOverlay {
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  background-color: rgba(0,0,0,.55);
-}
-
-.statusIcon {
-  margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */
-  width: 36px;
-  height: 36px;
-}
-
-.statusIcon[type="throbber"] {
-  background: url(chrome://global/skin/media/throbber.png) no-repeat center;
-}
-
-.statusIcon[type="throbber"][stalled] {
-  background: url(chrome://global/skin/media/stalled.png) no-repeat center;
-}
-
-.statusIcon[type="error"] {
-  background: url(chrome://global/skin/media/error.png) no-repeat center;
-}
-
-/* Overlay Play button */
-.clickToPlay {
-  width: 64px;
-  height: 64px;
-  -moz-box-pack: center;
-  -moz-box-align: center;
-  opacity: 0.7;
-  background-image: url(chrome://global/skin/media/clicktoplay-bgtexture.png),
-                    url(chrome://global/skin/media/videoClickToPlayButton.svg);
-  background-repeat: repeat, no-repeat;
-  background-position: center, center;
-  background-size: auto, 64px 64px;
-  background-color: hsla(0,0%,10%,.5);
-}
-.clickToPlay:hover {
-  opacity: 1;
-}
-
-/* Statistics formatting */
-html|*.statsDiv {
-  position: relative;
-}
-html|td {
-  height: 1em;
-  max-height: 1em;
-  padding: 0 2px;
-}
-html|table {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: white;
-  text-shadow:
-    -1px -1px 0 #000,
-    1px -1px 0 #000,
-    -1px 1px 0 #000,
-    1px 1px 0 #000;
-  min-width: 100%;
-  background: rgba(68,68,68,.7);
-  table-layout: fixed;
-  border-collapse: collapse;
-  position: absolute;
-}
-
-/* CSS Transitions */
-.clickToPlay {
-  transition-property: opacity, background-size;
-  transition-duration: 400ms, 400ms;
-}
-.clickToPlay[fadeout] {
-  background-size: auto, 192px 192px;
-  opacity: 0;
-}
-.clickToPlay[fadeout][immediate] {
-  transition-property: opacity, background-size;
-  transition-duration: 0s, 0s;
-}
-.controlBar:not([immediate]) {
-  transition-property: opacity;
-  transition-duration: 200ms;
-}
-.controlBar[fadeout] {
-  opacity: 0;
-}
-.volumeStack:not([immediate]) {
-  transition-property: opacity, margin-top;
-  transition-duration: 200ms, 200ms;
-}
-.volumeStack[fadeout] {
-  opacity: 0;
-  margin-top: 0;
-}
-.statusOverlay:not([immediate]) {
-  transition-property: opacity;
-  transition-duration: 300ms;
-  transition-delay: 750ms;
-}
-.statusOverlay[fadeout] {
-  opacity: 0;
-}
-
-/* Error description formatting */
-.errorLabel {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: #bbb;
-  text-shadow:
-    -1px -1px 0 #000,
-    1px -1px 0 #000,
-    -1px 1px 0 #000,
-    1px 1px 0 #000;
-  padding: 0 10px;
-  text-align: center;
-}
deleted file mode 100644
index 589abfbd5816bb3ec179a3fdf6530106356dba8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4398a569b8c76d0b42fd2900abfcdec1747a0483..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001