Backed out changeset f3ca96dd397e (bug 873251) for causing mochitest-metro-chrome failures
authorEd Morley <emorley@mozilla.com>
Wed, 19 Jun 2013 09:42:25 +0100
changeset 135566 59679baba21b48fc662d731b094b544e2c5e8c03
parent 135565 734147446def7c703e3d42d8740644bac4c3dec3
child 135567 abe93cefa9cfde1c3d7400df9638286d74688b61
push id29720
push useremorley@mozilla.com
push dateWed, 19 Jun 2013 08:52:20 +0000
treeherdermozilla-inbound@bef10ede6c1e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs873251
milestone24.0a1
backs outf3ca96dd397edfe661477f31a90fc093b18ad005
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f3ca96dd397e (bug 873251) for causing mochitest-metro-chrome failures
browser/metro/base/content/appbar.js
browser/metro/base/content/browser.xul
browser/metro/theme/browser.css
browser/metro/theme/defines.inc
browser/metro/theme/images/appbar-back.png
browser/metro/theme/images/appbar-back@1.4x.png
browser/metro/theme/images/appbar-forward.png
browser/metro/theme/images/appbar-forward@1.4x.png
browser/metro/theme/images/appbar-menu.png
browser/metro/theme/images/appbar-menu@1.4x.png
browser/metro/theme/images/appbar-pin.png
browser/metro/theme/images/appbar-pin@1.4x.png
browser/metro/theme/images/appbar-reload.png
browser/metro/theme/images/appbar-star.png
browser/metro/theme/images/appbar-star@1.4x.png
browser/metro/theme/images/appbar-stop.png
browser/metro/theme/images/back.png
browser/metro/theme/images/forward.png
browser/metro/theme/images/panel-light.png
browser/metro/theme/images/reload.png
browser/metro/theme/images/stop-hdpi.png
browser/metro/theme/jar.mn
--- a/browser/metro/base/content/appbar.js
+++ b/browser/metro/base/content/appbar.js
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 var Appbar = {
   get consoleButton() { return document.getElementById('console-button'); },
   get jsShellButton() { return document.getElementById('jsshell-button'); },
   get starButton()    { return document.getElementById('star-button'); },
   get pinButton()     { return document.getElementById('pin-button'); },
-  get menuButton()    { return document.getElementById('menu-button'); },
+  get moreButton()    { return document.getElementById('more-button'); },
 
   // track selected/active richgrid/tilegroup - the context for contextual action buttons
   activeTileset: null,
 
   init: function Appbar_init() {
     window.addEventListener('MozContextUIShow', this);
     window.addEventListener('MozContextUIDismiss', this);
     window.addEventListener('MozAppbarDismiss', this);
@@ -106,30 +106,30 @@ var Appbar = {
       });
     } else {
       Browser.unstarSite(function () {
         Appbar._updateStarButton();
       });
     }
   },
 
-  onMenuButton: function(aEvent) {
+  onMoreButton: function(aEvent) {
       var typesArray = ["find-in-page"];
       try {
         // If we have a valid http or https URI then show the view on desktop
         // menu item.
         var uri = Services.io.newURI(Browser.selectedBrowser.currentURI.spec,
                                      null, null);
         if (uri.schemeIs('http') || uri.schemeIs('https')) {
           typesArray.push("view-on-desktop");
         }
       } catch(ex) {
       }
 
-      var x = this.menuButton.getBoundingClientRect().left;
+      var x = this.moreButton.getBoundingClientRect().left;
       var y = Elements.navbar.getBoundingClientRect().top;
       ContextMenuUI.showContextMenu({
         json: {
           types: typesArray,
           string: '',
           xPos: x,
           yPos: y,
           leftAligned: true,
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -308,20 +308,20 @@
         <hbox id="progress-control" />
       </hbox>
 
       <!-- Main Toolbar -->
       <toolbar id="toolbar" observes="bcast_windowState" flex="1">
         <observes element="bcast_windowState" attribute="*"/>
         <observes element="bcast_urlbarState" attribute="*"/>
 
-        <toolbarbutton id="back-button" class="appbar-primary" command="cmd_back"/>
-        <toolbarbutton id="forward-button" class="appbar-primary" command="cmd_forward"/>
+        <toolbarbutton id="back-button" command="cmd_back"/>
 
         <hbox id="urlbar-container" flex="1" observes="bcast_urlbarState">
+          <toolbarbutton id="forward-button" command="cmd_forward"/>
           <hbox id="urlbar" flex="1">
             <box id="identity-box" role="button">
               <hbox id="identity-box-inner" align="center" mousethrough="always">
                 <image id="identity-icon"/>
               </hbox>
             </box>
 
             <textbox id="urlbar-edit"
@@ -332,29 +332,29 @@
                      completeselectedindex="true"
                      placeholder="&urlbar.emptytext;"
                      flex="1"
                      ontextentered="BrowserUI.handleUrlbarEnter(param);"
                      onkeydown="BrowserUI.navEditKeyPress();"
                      onclick="BrowserUI._urlbarClicked(event);"
                      onblur="BrowserUI._urlbarBlurred();"/>
           </hbox>
+        </hbox>
 
-          <toolbarbutton id="reload-button" oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
-          <toolbarbutton id="stop-button" command="cmd_stop"/>
-        </hbox>
+        <toolbarbutton id="tool-reload" oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
+        <toolbarbutton id="tool-stop" command="cmd_stop"/>
 
         <!-- developer buttons -->
         <toolbarbutton id="console-button" oncommand="Appbar.onConsoleButton()"/>
         <toolbarbutton id="jsshell-button" oncommand="Appbar.onJSShellButton()"/>
 
         <toolbarbutton id="download-button" oncommand="Appbar.onDownloadButton()"/>
-        <toolbarbutton id="star-button" class="appbar-primary" type="checkbox" oncommand="Appbar.onStarButton()"/>
-        <toolbarbutton id="pin-button" class="appbar-primary" type="checkbox" oncommand="Appbar.onPinButton()"/>
-        <toolbarbutton id="menu-button" class="appbar-primary" oncommand="Appbar.onMenuButton(event)"/>
+        <toolbarbutton id="star-button" type="checkbox" oncommand="Appbar.onStarButton()"/>
+        <toolbarbutton id="pin-button" type="checkbox" oncommand="Appbar.onPinButton()"/>
+        <toolbarbutton id="more-button" onclick="Appbar.onMoreButton(event)"/>
       </toolbar>
     </appbar>
 
     <!-- Context button bar -->
     <appbar id="contextappbar">
       <toolbar id="contextualactions-tray" flex="1">
         <toolbarbutton id="delete-selected-button" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('delete')"/>
         <toolbarbutton id="restore-selected-button" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('restore')"/>
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -1,17 +1,18 @@
 /* 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/. */
 
 %filter substitution
 %include defines.inc
 
-%define forward_transition_length 200ms
-%define forward_spacing 50px
+%define forward_transition_length 150ms
+%define forward_width 22px
+%define forward_spacing 12px
 
 /* Progress meter ------------------------------------------------- */
 
 #progress-container {
   display: block;
   position: absolute;
   top: -@progress_height@;
   height: @progress_height@;
@@ -207,17 +208,17 @@ documenttab[selected] .documenttab-selec
   padding: 0 @metro_spacing_small@;
 }
 
 #tabs-controls toolbarbutton {
   margin: @toolbar_vertical_spacing@ @toolbar_horizontal_spacing@;
 }
 
 #newtab-button {
-  list-style-image: url(chrome://browser/skin/images/newtab-default.png);
+  list-style-image: url("images/newtab-default.png");
 }
 
 /* Selection overlay and monocles ----------------------------------------------- */
 
 #page,
 .selection-overlay {
   -moz-stack-sizing: ignore;
 }
@@ -241,59 +242,58 @@ documenttab[selected] .documenttab-selec
   margin-top: -30px;
   margin-left: -18px;
   pointer-events: auto;
 }
 
 /* Toolbar ------------------------------------------------------------------ */
 
 #toolbar {
-  background-color: @panel_light_color@;
+  background-color: @panel_dark_color@;
+  background-image: @panel_dark_background@;
 }
 
 #toolbar > #back-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-back.png);
+  list-style-image: url(chrome://browser/skin/images/back.png);
+  -moz-image-region: rect(0 96px 48px 48px);
   position: relative;
   z-index: 1;
-  transition: opacity @forward_transition_length@ ease-out;
+  -moz-margin-end: -@forward_spacing@;
+  min-height: 48px;
+  max-height: 48px;
 }
 
 #toolbar > #back-button[disabled] {
   visibility: visible;
-  opacity: 0.5;
+  -moz-image-region: rect(0 48px 48px 0);
 }
 
-#toolbar > #forward-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-forward.png);
-  transition: margin @forward_transition_length@ ease-out,
-              visibility @forward_transition_length@ ease-out,
+#forward-button {
+  list-style-image: url(chrome://browser/skin/images/forward.png);
+  -moz-image-region: rect(1px 22px 25px 0); /* width: 22px; height: 24px; */
+  -moz-border-end: @metro_border_thick@ solid @urlbar_border_color@;
+  margin: -1.5px 0;
+  padding: 0;
+  -moz-padding-start: calc(@metro_spacing_snormal@ + @forward_spacing@);
+  -moz-padding-end: @forward_spacing@;
+  transition: -moz-margin-start @forward_transition_length@ ease-out,
               opacity @forward_transition_length@ ease-out;
 }
 
-#toolbar > #forward-button[disabled] {
-  -moz-margin-start: -@forward_spacing@;
-  visibility: hidden;
+#forward-button[disabled] {
+  -moz-margin-start: calc(-@forward_width@ - @forward_spacing@ * 2);
   opacity: 0;
   pointer-events: none;
 }
 
-@media (min-resolution: 130dpi) {
-  #toolbar > #back-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-back@1.4x.png);
-  }
-
-  #toolbar > #forward-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-forward@1.4x.png);
-  }
-}
-
 /* URL bar */
 #urlbar-container {
   border: @metro_border_thick@ solid @urlbar_border_color@;
-  margin: 0 @toolbar_horizontal_spacing@;
+  margin: 0;
+  -moz-margin-end: @toolbar_horizontal_spacing@;
   padding: 0;
   background-color: @field_background_color@;
   overflow: hidden;
 }
 
 #urlbar-container[mode="edit"] {
   border-color: @metro_orange@;
 }
@@ -330,27 +330,27 @@ documenttab[selected] .documenttab-selec
 
 #urlbar-edit > hbox > .textbox-input-box > .textbox-input:invalid {
   /* Hide error glow around the address bar that shows by default
    * when URLs are made invalid by trmming. */
   box-shadow: none !important;
 }
 
 /* Combined stop-reload button */
-#reload-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-reload.png);
+#tool-reload {
+  list-style-image: url("chrome://browser/skin/images/reload.png");
 }
 
-#stop-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-stop.png);
+#tool-stop {
+  list-style-image: url("chrome://browser/skin/images/stop-hdpi.png");
 }
 
-#toolbar[mode="loading"] > #urlbar-container > #reload-button,
-#toolbar:-moz-any([mode="edit"], [mode="view"]) > #urlbar-container > #stop-button,
-#toolbar[viewstate="snapped"] > #urlbar-container ~ toolbarbutton {
+#toolbar[mode="loading"] > #tool-reload,
+#toolbar:-moz-any([mode="edit"], [mode="view"]) > #tool-stop,
+#toolbar[viewstate="snapped"] > #tool-stop ~ toolbarbutton {
   visibility: collapse;
 }
 
 /* App Bar ----------------------------------------------------------------- */
 
 appbar {
   display: block;
   position: fixed;
@@ -400,55 +400,16 @@ appbar > toolbar > toolbarbutton {
 }
 appbar > toolbar > toolbarbutton:hover {
   -moz-image-region: rect(40px, 200px, 80px, 160px);
 }
 appbar > toolbar > toolbarbutton:active {
   -moz-image-region: rect(80px, 200px, 120px, 160px);
 }
 
-#toolbar > .appbar-primary {
-  -moz-image-region: rect(0 40px 40px 0);
-}
-
-#toolbar > .appbar-primary:not([checked]):hover:not(:active) {
-  -moz-image-region: rect(0 80px 40px 40px);
-}
-
-#toolbar > .appbar-primary:not([checked]):active {
-  -moz-image-region: rect(0 120px 40px 80px);
-}
-
-#toolbar > .appbar-primary[checked]:hover:not(:active) {
-  -moz-image-region: rect(0 160px 40px 120px);
-}
-
-@media (min-resolution: 130dpi) {
-  #toolbar > .appbar-primary > .toolbarbutton-icon {
-    width: 40px;
-    height: 40px;
-  }
-
-  #toolbar > .appbar-primary {
-    -moz-image-region: rect(0 56px 56px 0);
-  }
-
-  #toolbar > .appbar-primary:not([checked]):hover:not(:active) {
-    -moz-image-region: rect(0 112px 56px 56px);
-  }
-
-  #toolbar > .appbar-primary:not([checked]):active {
-    -moz-image-region: rect(0 168px 56px 112px);
-  }
-
-  #toolbar > .appbar-primary[checked]:hover:not(:active) {
-    -moz-image-region: rect(0 224px 56px 168px);
-  }
-}
-
 /* Application-Specific */
 #download-button {
   -moz-image-region: rect(0px, 40px, 40px, 0px) !important;
 }
 #download-button:hover {
   -moz-image-region: rect(40px, 40px, 80px, 0px) !important;
 }
 #download-button:active {
@@ -463,42 +424,39 @@ appbar > toolbar > toolbarbutton:active 
 }
 #plugin-button:active {
   -moz-image-region: rect(80px, 80px, 120px, 40px) !important;
 }
 
 /* Page-Specific */
 
 #pin-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-pin.png);
+  -moz-image-region: rect(0px, 240px, 40px, 200px) !important;
+}
+#pin-button:hover {
+  -moz-image-region: rect(40px, 240px, 80px, 200px) !important;
+}
+#pin-button:active {
+  -moz-image-region: rect(80px, 240px, 120px, 200px) !important;
+}
+#pin-button[checked] {
+  -moz-image-region: rect(0px, 280px, 40px, 240px) !important;
 }
 
 #star-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-star.png);
+  -moz-image-region: rect(0px, 360px, 40px, 320px) !important;
 }
-
-#menu-button {
-  list-style-image: url(chrome://browser/skin/images/appbar-menu.png);
+#star-button:hover {
+  -moz-image-region: rect(40px, 360px, 80px, 320px) !important;
 }
-
-@media (min-resolution: 130dpi) {
-  #pin-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-pin@1.4x.png);
-  }
-
-  #star-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-star@1.4x.png);
-  }
-
-  #menu-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-menu@1.4x.png);
-  }
+#star-button:active,
+#star-button[checked] {
+  -moz-image-region: rect(80px, 360px, 120px, 320px) !important;
 }
 
-
 #contextualactions-tray {
   background-color: @metro_orange@;
 }
 
 #contextualactions-tray > toolbarbutton {
   opacity: 1;
 }
 #contextualactions-tray > toolbarbutton[fade] {
@@ -816,33 +774,26 @@ setting[type="radio"] > vbox {
 }
 
 #panel-close-button {
   background: transparent;
   border: 0 none;
   -moz-appearance: none;
   margin: 0;
   -moz-margin-end: 40px;
-  list-style-image: url(chrome://browser/skin/images/appbar-back.png);
-  -moz-image-region: rect(0 40px 40px 0);
+  list-style-image: url(chrome://browser/skin/images/back.png);
+  -moz-image-region: rect(0 48px 48px 0);
   padding: 0;
-  min-height: 40px;
-  max-height: 40px;
+  min-height: 48px;
+  max-height: 48px;
   -moz-box-pack: center;
 }
 
-@media (min-resolution: 130dpi) {
-  #panel-close-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-back@1.4x.png);
-    width: 40px;
-  }
-}
-
 #panel-close-button[disabled] {
-  opacity: .5;
+  -moz-image-region: rect(0 96px 48px 48px);
 }
 
 #panel-view-switcher {
   border: 0 none !important;
   color: #000 !important;
   background: transparent;
   padding: 0;
   font-size: @metro_font_xlarge@;
@@ -1096,9 +1047,9 @@ setting[type="radio"] > vbox {
 }
 
 .autoscroller[scrolldir="NS"] {
   background-position: right center;
 }
 
 .autoscroller[scrolldir="EW"] {
   background-position: right bottom;
-}
+}
\ No newline at end of file
--- a/browser/metro/theme/defines.inc
+++ b/browser/metro/theme/defines.inc
@@ -1,13 +1,14 @@
 %filter substitution
 
 %define panel_dark_color #41464C
 %define panel_dark_background url(chrome://browser/skin/images/panel-dark.png)
 %define panel_light_color #F1F1F1
+%define panel_light_background url(chrome://browser/skin/images/panel-light.png)
 
 %define field_sizing 30px
 %define field_foreground_color #000000
 %define field_disabled_foreground_color #999999
 %define field_mid_foreground_color #bababa
 %define field_background_color #FFFFFF
 
 %define border_color #BFC6CE
deleted file mode 100644
index b21510d4d155391872869baf6370de49c6b63182..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fd0b2d37911af8ebbf8712a5a0d4602a95ca770b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4b9f1e342440b7ced0a2a3b4cddc4e2b347d5131..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bb61481dab1d4248d6da268f3e9f48d632fd3ca5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2bc354eb7e9b44273c87fcdace774d141cf8a690..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bb0cf44e96a9f2adaf9f95b5508f8695dcab0fc3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 60972778c4ccc97d16b9b562837c6bcc787cdd4a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b3383337336816c60acd86db67c70428235c0187..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fa1b0555c90e8bdae7b2aed53fa3855669e3bf39..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3f8dc708dd92eb1129c7d7708f833777a6f82894
GIT binary patch
literal 2260
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
rename from browser/metro/theme/images/appbar-forward.png
rename to browser/metro/theme/images/forward.png
index ed0d4a03c76d83c2cf8bf3c32fbbfa72a851a44a..f811984f3619873d46439ac65ae2d1c903d9b010
GIT binary patch
literal 1336
zc%17D@N?(olHy`uVBq!ia0vp^;y^6P!3HF6DQvv};*_{XlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5OtoQPV9v-4i71Ki^|4CM&(%u=snM&*Enolv8~cia#N_PM5{0DH
z^vpb4rT4q{D=B2A*eZpa`WpBaIHzW0dQ=sq23ProBv)l8Tc#-4+bP&oSOE>lO)W`O
zsL0L9E4HezRRWu91!RMS^_3LBN=mYAl^~9a@C{IK&M!(;Fx4~GO*SwzR4_BsGc++Z
zGc(jtFfuSS(l-DiGhIUyD^oKoBXb2PPy*Ukl#*r@<l+Xk3&^uo$|xx*u+rBrFE7_C
zH`dE9O4m2Ew6p}7VPvEWRH0j3nOBlnp_^B%3^TzcwK%ybv!En1KTiR~PfW@$EwNQn
zf_Wjgz}FXUa9%MqpnyT9Uy)d#Z>VRWpPQ=>Q(asVl$wTLb#X{#L8^XGYH@yPQ8F+-
z(v*>`!mkyi5a=2!|DsG_q$K9J<R_QrrskD+y4WfKW%N=qQ><K!%-t+4&CCqkj10^y
z3=J(D&0HJ}jhtL84b9w)j7?x>VAE^nW?*RSXzu9bXzFNa=xS(bVq|XVWbWu}Y3O3=
zW@rY}>zP+vl9-pA3e%g3&})fTua$FAYGO%#QAmD%4lD%(WaO9R7iZ)bC^!e3DQNg6
zCTHe>1T;Yr1a)g_QD#|cid#{Bt^zoOtunE=z{SGM(A3z?($od&a{~)w7fV-1LpMuj
z7h^}D3m|$^$O$!lpkwsWk_$`-m<B;ic;W|g;MpfN5140)fSF^f#ZoH<2F5f`7sn8f
z<6AF#W-&R69Q)X&#(v@)_Y)RNH-!XwMa3_RirObshD94&Zke^x_`Y*d!yJVPy@kRt
zSC+-?%bJq$an+FvdUf3L^8eXhe(N|fd+J8{so$j21??VkPt%!wWlN##J4RlQ6aTg2
z^7i)4YS)|K=ydPKvSpq628qv^=X_l8GpValM}=i^b-7KQ+0O|Kkscgv)#-ag><eo=
z8h{d2uY1I$`_1fB9K?i}()R?^7kpG?+%&=98^il8({dc-HJF8(_E&t3V@mb-KJD_4
zlUHTWI`G%L|M6*B+5`4ydlq*~b52oY&3<{msG@E!XYB$WjfnL4qs^PYsVHhFwC&@5
zUA-?pb7#wf28myKbL20^?aUNzVoG|k`+{}3O_wEDP4~lVlJ|S1mWc*9@YISgu1>F6
z9%5e0Y$(D}{Jtk&{Pi-v366~k+k_vr&eCL;cVOmX+3aokIJ#9!o&EiV*3i>xsmJOW
YQyo`%Tze<H4OEtSy85}Sb4q9e0Gd0<CjbBd
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..60eee10dcb6970db972ce963dd23ed515000d0e0
GIT binary patch
literal 484
zc$@*`0UQ2_P)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003~Nkl<ZI8SYpL2|-C3<UT8zXfc^7$4G0
zQ(Z2SJvfS_kwzLZwr$(@ov+5v`)T{0?{^%>mxr8z%K#XXG{k)QuT`*@Wf^3g=P3r8
zM?fMP>$*yZP&8k!7oI^ZBrb`NBoVn>Sr~GJK>&<-JZjlfKww!kw*5wXvV#pPFJTMW
zu(lI?rDSS5*RZ-Qu0$r-hJRH_GZz*t@#f4H4sR7V=g!-l<(dM>kY@{%9^xfip?|<l
zcs;Vm<DrBuFLv4X_*|IfsohDapCdFgU`UaJlkeb90;;ejEQiM<wU9H`U`mxj@ysJw
z!7N$>{PR4!M_6#~mT=~1>rYY14!owC&8lo=Hiop#Rze}4BWVVZ?k0MMY}ikTG}cDB
zIdiJGr~0_C4x=cY{i#l=QpgRfO*@0Od+7=R-)=XW&-0WRUtIoM!!P4`Q03g#*Zsac
a_vII!yNOGGqBQjY0000<MNUMnLSTY@`pO9a
rename from browser/metro/theme/images/appbar-reload.png
rename to browser/metro/theme/images/reload.png
index 083c5952e31c168203f17651cc9d7e76561a1874..f3b89dfd80c1a7a0e9de8ce3e7bf53dd9ef10b86
GIT binary patch
literal 1686
zc$}S8c~BEq7*DY<BBCNA%28Psu%IS;glxz{fP_sXjDc_r;&`#yERaI7VY5hpQ3t6g
zmC~`GQ%5M?W0fji6~)oER!7B~Lj|ctxhhh%Xh%^x-B4mX9mhZV=Iy@sz5RZ_?|a`d
zTdqr3;6BM`l0YDE*TfOY{OZF$z7t*ex8AERhhMxoRXUf#WO4;0OA8bRMo$A86PZOP
z)1;v=?-Cs;5KO2trlxc0+J!j9m_(#qM`SZu1ojabZL^S64$T32I?HI5gHM{yf`HK=
z2Ny}Su+|bwXB*>+SUROBA(bl1p=1UyItqxi;XHwf=19P1$~9YYn;abD#reJc7y^MY
z6)r~({_Rw{RtLl~EDcCRVj%@12!LTCBus)~$b0~W5fp;?i3yP~T!P`K6c`^MZ;dr%
z;>m=1+!im%!EBDR;1E<$P#`K0ix@TwLS!<TodZRMyoS(PXy!<p&}<EKFc7qrVvQEg
z$e01UOzN3@P7Z>OE0`==?OS5Abv#gf$RHbOfe;Z4nM{yF+sY-=neW%OrWRUgD4Di0
z`7FifBQx+{rrr;=EArmpiL8-N3YkkVRKAHea~eVp@?S&-qX8#Ssaht(Fj$SkSU7@&
zD=<QVph`l9U}{tx=HPf2R*j<JC@PgGQ5k_CDny}16@&!ER1%E9!cmC>t1(+S(oE3~
ztnnXg*n6>fEK8Fd!=^G!uA>5U*$l^6vl$Bzn}Pu$h*$)VB_0;T5|K$1hDgTiKn%eW
z97S*#=4U7XglI|1XtrZR?YSJk7R?%0(groln1Hcl;Kp}3D}`04Dpo3q9S;(UDwMLY
zFeySv#A=lk9LE~|Pk<rb8R$Qi<v8NY)xLe(C%o{s(`Yl_UM$~7b0=-~76_cSY6wND
zt>akxinx>{zwe(l<++!ttGDUC4XUq*SyANr+3cc$9lCuJE51~6a6@#}rvv^Ux+J9^
zbn&=Swmn0(GkO{^x43%1|4!__siPl|hBbiGysnY2@uNeJ?==n92l`K~DgJG=%euP1
zCSnm@i`B>PeqD*w-C`{#Y-Jkx&`4cLNY1laOSG?7AB7GJe3RC(jc|#FQEeT@CzH-z
zoi6%@2i*a!KTtP^CKP#G@V%QBTsr?ccPpXmc>3vz{hqITJ0n7)Ev_e?PHaAMu&u}W
zl+WP(m>1J#sQQAPPuxnY66bes8`UrOe7ZQ&;G@|pK6F02t85w7IQZTA-S^ff1}(^&
z84)n@GHD7l<(EBs*UTPf9<&Uh<#&4nA0gWdFD0@bk>}j1JFfOWiCMIB73i<%?FhoC
z*1kXEPbS8@1z)S)<*M5pa(k`w+WH@XHwkGQmbi2Trmfi0-QKq<Z;x=Bf9bx4U#reN
zZoE0z*0cBHqm*RN!oJ+AOWRLtj>T(>m6fRlUtH{uI9)L7Vbj1oCt=&tng-YBex0>M
zwj0({ksaTX6%f@~``9W3b;&Kuh3Xg3gp-ALLe9)Ruv;X~AKv6SKr{zjJM{cU9do_D
z%x%+GiN<-#pQF%In|EC*6*Ye3M{VJJ|Cp_=-f{Z@9`CoXW%|hyNWW?2qo2-JE$~TM
zDy#7BJ?<2jQFT72slhGru)E3jc~O3x%>T@A_rT))Rxh{y@_QGVUhmK|%Z~qkC1vAF
z_rtxdH}{gwiG{^k&yT#R)#bh_SLapKMztG8B|Z8BH5a}C(_*Ga+@J>7>Y4Lf{Q_#+
zHUzFyuDO4s<i)Iu$Gj#7UEZq8sQCm++eo=hh38bxdF44cV+82S3a)&(v2A#@D=fHt
VJtN_+4QaOjDKx4C;-E5P?O!Fbcu@cV
rename from browser/metro/theme/images/appbar-stop.png
rename to browser/metro/theme/images/stop-hdpi.png
index 1df36a2b67d9ed6d6922dbc0542dc32cbd6e52b6..2a2fcdfddddc29f595c6a2f6438a1b94b27e1387
GIT binary patch
literal 737
zc$@*@0v`Q|P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipP}
z6e%YepDYys00Lo2L_t(Y$L*HOYZFlv#=k4B-RMdYq=;?`(v>0-ZEM=v^g%7IN=s-+
z8B#)PG*q$O_&`JK*bo{E;-XOcNSmgm4JAoyY*EmS3&Dj2DT3(Ag@3?3<E9hBWbVwJ
z$x;s-81DTzKhAgW%pBlf3nn9q-kX>J@KCa5Hva6<&6>e?$HpfCL>x9$d>(t;;u;)@
zK6nX0ap~qqHU8w1WAN=e_tOAw)p(SjUrau|APpXgj1>TQ0U)8q*x{NcLo(5SOQ^B4
zw&3tcbQgdJ0FsF~GwfNyE%d*ViTFt&I24Y20?+^esibP^MkpLHg-hsvr;_Rkef^03
zpbU?GC87o*0uc$jN+ngMYxERB0aWUaE5oCIs=&ngIpQ384k=-wtuxb8OxMj!PYIzz
zN?5C`Nt_?6vN{k9nSx%wN-;Or*{)u>V@_n6{(z!6h57@ECaPy<wJ-<#L23AaKd4#N
zsseM)EwitG&=%g;Kd9N&(c@?(xYlq|L%QR|`B~dbwm3h_WIL8R<K?9}>6^X0G{>Bs
zF>%w(tSmTwoiZy6OjJ+G>b2Fh5Zc+@t95qw3NPH+YMMz}O(o(4JvY`fLa48!N7Hq_
zjvgU=V?DzvYZ9j~Rp8uawuuuj87(nJTYHygw6CqbO9-#f?dLYL^}^p`ORKN^TP);r
z%&=$qE?emL3;Eo6+d<&E_eL4MUEE@aYf@h?6aB$<ajQ;x^l5BvEyHVwgVIjE&hfB!
zt<n1)z-5=v?{7=RGp@&5&(&r(@E?1-JEv<N=&yL1J^;8V3H|wQ@69Rv4@3L~-bP6@
T&Ya&%00000NkvXXu0mjf*j-HB
--- a/browser/metro/theme/jar.mn
+++ b/browser/metro/theme/jar.mn
@@ -16,29 +16,21 @@ chrome.jar:
 * skin/forms.css                            (forms.css)
 * skin/platform.css                         (platform.css)
   skin/touchcontrols.css                    (touchcontrols.css)
   skin/netError.css                         (netError.css)
 % override chrome://global/skin/about.css chrome://browser/skin/about.css
 % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css
 % override chrome://global/skin/netError.css chrome://browser/skin/netError.css
 
+  skin/images/panel-light.png               (images/panel-light.png)
   skin/images/panel-dark.png                (images/panel-dark.png)
-  skin/images/appbar-back.png               (images/appbar-back.png)
-  skin/images/appbar-back@1.4x.png          (images/appbar-back@1.4x.png)
-  skin/images/appbar-forward.png            (images/appbar-forward.png)
-  skin/images/appbar-forward@1.4x.png       (images/appbar-forward@1.4x.png)
-  skin/images/appbar-star.png               (images/appbar-star.png)
-  skin/images/appbar-star@1.4x.png          (images/appbar-star@1.4x.png)
-  skin/images/appbar-pin.png                (images/appbar-pin.png)
-  skin/images/appbar-pin@1.4x.png           (images/appbar-pin@1.4x.png)
-  skin/images/appbar-menu.png               (images/appbar-menu.png)
-  skin/images/appbar-menu@1.4x.png          (images/appbar-menu@1.4x.png)
-  skin/images/appbar-reload.png             (images/appbar-reload.png)
-  skin/images/appbar-stop.png               (images/appbar-stop.png)
+  skin/images/back.png                      (images/back.png)
+  skin/images/forward.png                   (images/forward.png)
+  skin/images/reload.png                    (images/reload.png)
   skin/images/newtab-default.png            (images/newtab-default.png)
   skin/images/closetab-default.png          (images/closetab-default.png)
   skin/images/tab-arrows.png                (images/tab-arrows.png)
   skin/images/tab-crop.png                  (images/tab-crop.png)
   skin/images/tab-overlay.png               (images/tab-overlay.png)
   skin/images/identity-icons-generic.png    (images/identity-icons-generic.png)
   skin/images/identity-icons-https-ev.png   (images/identity-icons-https-ev.png)
   skin/images/identity-icons-https-mixed.png  (images/identity-icons-https-mixed.png)
@@ -65,16 +57,17 @@ chrome.jar:
   skin/images/arrowbox-down.png             (images/arrowbox-down.png)
   skin/images/arrowbox-horiz.png            (images/arrowbox-horiz.png)
   skin/images/favicon-default-32.png        (images/favicon-default-32.png)
   skin/images/errorpage-warning.png         (images/errorpage-warning.png)
   skin/images/errorpage-warning.png         (images/errorpage-warning.png)
   skin/images/errorpage-larry-white.png     (images/errorpage-larry-white.png)
   skin/images/errorpage-larry-black.png     (images/errorpage-larry-black.png)
   skin/images/throbber.png                  (images/throbber.png)
+  skin/images/stop-hdpi.png                 (images/stop-hdpi.png)
   skin/images/alert-downloads-30.png        (images/alert-downloads-30.png)
   skin/images/identity-default-hdpi.png     (images/identity-default-hdpi.png)
   skin/images/identity-ssl-hdpi.png         (images/identity-ssl-hdpi.png)
   skin/images/identity-ev-hdpi.png          (images/identity-ev-hdpi.png)
   skin/images/search-glass-30.png           (images/search-glass-30.png)
   skin/images/play-hdpi.png                 (images/play-hdpi.png)
   skin/images/pause-hdpi.png                (images/pause-hdpi.png)
   skin/images/mute-hdpi.png                 (images/mute-hdpi.png)
@@ -84,9 +77,9 @@ chrome.jar:
   skin/images/scrubber-hdpi.png             (images/scrubber-hdpi.png)
   skin/images/selection-monocle.png         (images/selection-monocle.png)
   skin/images/appbar-icons.png              (images/appbar-icons.png)
   skin/images/pinned-hdpi.png               (images/pinned-hdpi.png)
   skin/images/tile-selected-check-hdpi.png  (images/tile-selected-check-hdpi.png)
 
   skin/images/overlay-back.png              (images/overlay-back.png)
   skin/images/overlay-plus.png              (images/overlay-plus.png)
-  skin/images/autoscroll.png                (images/autoscroll.png)
+  skin/images/autoscroll.png                (images/autoscroll.png)
\ No newline at end of file