Backed out changeset 99ae0e6a6fec (bug 885242)
authorEd Morley <emorley@mozilla.com>
Thu, 18 Jul 2013 11:14:09 +0100
changeset 152216 acb70848a575d80bba9745a9f0f5d7056160f246
parent 152215 2f1324bb6e192dd39df8a592ca2e15aa94b268c1
child 152217 f97cf639d081f6152693f4b8d2566deffd2cbaca
push id382
push userakeybl@mozilla.com
push dateMon, 21 Oct 2013 21:47:13 +0000
treeherdermozilla-release@5f1868ee45cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs885242
milestone25.0a1
backs out99ae0e6a6fec64c9dd9d32a8378d047f7b492ab3
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 99ae0e6a6fec (bug 885242)
browser/metro/base/content/browser.xul
browser/metro/theme/browser.css
browser/metro/theme/images/appbar-reload.png
browser/metro/theme/images/appbar-stop.png
browser/metro/theme/images/urlbar-go.png
browser/metro/theme/images/urlbar-go@1.4x.png
browser/metro/theme/images/urlbar-go@1.8x.png
browser/metro/theme/images/urlbar-reload.png
browser/metro/theme/images/urlbar-reload@1.4x.png
browser/metro/theme/images/urlbar-reload@1.8x.png
browser/metro/theme/images/urlbar-stop.png
browser/metro/theme/images/urlbar-stop@1.4x.png
browser/metro/theme/images/urlbar-stop@1.8x.png
browser/metro/theme/jar.mn
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -277,24 +277,20 @@
             </box>
 
             <textbox id="urlbar-edit" type="url" flex="1"
                      autocompletesearch="history"
                      autocompletepopup="urlbar-autocomplete"
                      completeselectedindex="true"
                      placeholder="&urlbar.emptytext;"/>
 
-            <toolbarbutton id="go-button" class="urlbar-button"
-                           command="cmd_go"/>
-            <toolbarbutton id="reload-button" class="urlbar-button"
-                           oncommand="CommandUpdater.doCommand(
-                                        event.shiftKey ? 'cmd_forceReload'
-                                                       : 'cmd_reload');"/>
-            <toolbarbutton id="stop-button" class="urlbar-button"
-                           command="cmd_stop"/>
+            <toolbarbutton id="reload-button" oncommand="
+              CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload'
+                                                      : 'cmd_reload');"/>
+            <toolbarbutton id="stop-button" command="cmd_stop"/>
           </hbox>
 
           <toolbarbutton id="download-button" class="appbar-secondary"
                          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()"/>
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -565,118 +565,30 @@ 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 */
-.urlbar-button {
-  -moz-image-region: rect(0px, 30px, 30px, 0px);
-}
-
-.urlbar-button:hover:not(:active) {
-  -moz-image-region: rect(0px, 60px, 30px, 30px);
-  background-color: #dedfdf;
-}
-
-.urlbar-button:active {
-  -moz-image-region: rect(0px, 90px, 30px, 60px);
-  background-color: #6d7073;
-}
-
-.urlbar-button  > .toolbarbutton-icon {
-  width: 30px;
-  height: 30px;
-}
-
-#go-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-go.png)
-}
-
 #reload-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-reload.png);
+  list-style-image: url(chrome://browser/skin/images/appbar-reload.png);
 }
 
 #stop-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-stop.png);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  .urlbar-button {
-    -moz-image-region: rect(0px, 42px, 42px, 0px);
-  }
-
-  .urlbar-button:hover:not(:active) {
-    -moz-image-region: rect(0px, 84px, 42px, 42px);
-  }
-
-  .urlbar-button:active {
-    -moz-image-region: rect(0px, 126px, 42px, 84px);
-  }
-
-  #go-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-go@1.4x.png)
-  }
-
-  #reload-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-reload@1.4x.png);
-  }
-
-  #stop-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-stop@1.4x.png);
-  }
+  list-style-image: url(chrome://browser/skin/images/appbar-stop.png);
 }
 
-@media (min-resolution: @min_res_180pc@) {
-  .urlbar-button {
-    -moz-image-region: rect(0px, 54px, 54px, 0px);
-  }
-
-  .urlbar-button:hover:not(:active) {
-    -moz-image-region: rect(0px, 108px, 54px, 54px);
-  }
-
-  .urlbar-button:active {
-    -moz-image-region: rect(0px, 162px, 54px, 108px);
-  }
-
-  #go-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-go@1.8x.png)
-  }
-
-  #reload-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-reload@1.8x.png);
-  }
-
-  #stop-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-stop@1.8x.png);
-  }
-}
-
-#urlbar:-moz-any([mode="loading"], [mode="view"]) > #go-button,
-#urlbar:-moz-any([mode="edit"], [mode="loading"]) > #reload-button,
+#urlbar[mode="loading"] > #reload-button,
 #urlbar:-moz-any([mode="edit"], [mode="view"]) > #stop-button,
 #toolbar[viewstate="snapped"] > #urlbar ~ toolbarbutton {
   visibility: collapse;
 }
 
-/* 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 {
-  -moz-image-region: rect(80px, 40px, 120px, 0px) !important;
-}
-
 /* Page-Specific */
 
 #pin-button {
   list-style-image: url(chrome://browser/skin/images/navbar-pin.png);
 }
 
 #star-button {
   list-style-image: url(chrome://browser/skin/images/navbar-star.png);
@@ -709,16 +621,28 @@ documenttab[selected] .documenttab-selec
     list-style-image: url(chrome://browser/skin/images/navbar-star@1.8x.png);
   }
 
   #menu-button {
     list-style-image: url(chrome://browser/skin/images/navbar-menu@1.8x.png);
   }
 }
 
+/* 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 {
+  -moz-image-region: rect(80px, 40px, 120px, 0px) !important;
+}
+
 /* Panel UI ================================================================ */
 
 #panel-container {
   padding: 60px 40px;
 }
 
 #panel-container[viewstate="snapped"] .canSnapTiles .richgrid-item-content {
   -moz-box-orient: horizontal;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..083c5952e31c168203f17651cc9d7e76561a1874
GIT binary patch
literal 1650
zc$|e*3rrJd9B(E9Vx4uf3>e^fZi>$9J^G+M?2z_~)X=6vRUp2OyDL569$pXIlIWPC
zsPjd(_!uk;5Qm`Id?t%*&SmUj=3@+Xaao2qbv_b_XqekH+Z|XmOK@NAyYKt{`Tc(1
z|Nf8MW}kQ7gru}2jYc!UT|g8mYnnO}<CS;&{K9j}k}A7O<YFNphe?Ui<k3Po1GqV|
zf+=E1I=bpKGe@HtbBpzt$R(aaoDw(#sbUNfPSmJlPHsdbsY*r$%9#q5w}btiUw{Bh
z+rh<V58@G>Opq<8k(lBdub--^q-->p`zA0af-3?XBa=XctKvg=#10PW;>un%!yqsO
zkt^-suu~--AK(-u1~40p5QU&9V6hlbli6ZHX9F05VlbjS76>)rW($sG15XC1+$PZh
zyoktua+h+lgF#sqaTpGV!-lZYAV?K3YO~o?4Ge=61Qd$$G8uvR(6pEW!GtJ@6=hc7
z0rgCl3)Qk61Y@7Ti6gRn=t-EAfWZ+`gi!+m$AC07f)lHys-eqi3TCPpj^X8yf<@tH
zL_MD8%W~WZIwTh{f#;(`{;0^nMNCMjmMA63foUpP#GMjD%7Ww<gsND?eL+DMLP0?U
zoW&L(%R^EuuNr1P!(a$y+Ce4$MhL+m6!W7-97Av;1|e1)L586ofo22IXQ37qilMm4
zs-y}+vY$eg<kO@~{x6uO@PHt3q>=$vtyfs&D~2RI9^B1`WRj;CH(>`Ai-Bcn9J3;M
zrfjRx>2SJG)P*^+v3w_CHs)oUTrL#DVq8L?s?|Kixb#!5X;iLS(Zg&;VplVCz9ewK
zP&ROObYIZXeHrG`qx*u5%7qnY;Q!QX%%n7dx*h30<uKB}46ih;q;#kB)~latG%rkX
z6M6oEZ};_h3j7OFYWv=O{6ovB(?1g>J`brSpd$<892dO7Nq*h213~@q$^~U?&!hJ1
zR=mtxx^nW59l_M@S^LlW;_{2TCPT07EPPzk|LDqI<L}F6^k3~eW$O+1UR(&a{31`V
z4_4+(@818J^Ec+ep($<Rq}}36orjk+_Ka;<4_r%~uif77iZ9l^5+x3g?VuA*t~3t%
zK>MXy@{Dukg9I+IukqfZj4f^R8j*3OEw=BMGFcWRjmW%u6_)nxjqb4ZII=GN6NHZF
z-kD)tchUFy9Wh;4x>_FJ9K21Ymp|N`oHa2A<t|^;I~y*17dSK5l&h;7IHX^`)!tZs
zb5Za5)tmaV-mA|qEE}xa(ku?FO>T)UJrO=SZpyX{c&h&H*@N{d=aL<tr#8mZP|h;P
z?HeETt<imDn9;=^O*ntACI7td6I|%c(V}rpx;FT)+z!0vZf0GI1>ezh(qG5R6U}+r
z`lfl_<+B_=b;d7Vk<@Z)Ri<rCd!jyf&)TGJomZ$GXq_cP4g7|b>Ar;H{)Nqh59en5
znx}OitScilaQ9~O^}joOQ<LxH)|PJS)4$(5dsnmm!()G@Z@2Yd+Sv;2I-y;4FFwP%
z{{GExDt2EkHFa)GU)<WB*j1m}R6C&6mp7aY?b-OKtv~qo{cT@6x4+SF&9aqz@yMp$
z#MaD?gCF^3-UxP$Exa;j?bIEAq<qQ7J*b5qOcdcI?(r|D)vJF2x64a>>{zkxUs{Jm
A#sB~S
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1df36a2b67d9ed6d6922dbc0542dc32cbd6e52b6
GIT binary patch
literal 1457
zc$|e)drTZf9KKpop$RQEB~cQ?b|JP}?)G)h@s8KsQ4TqB9#<r(u`auF#};;H*<Iic
zYZ^%dR@1a<OxySezN+Dmf=a8V#sF$x!L(Xh(~3oc#=b(UZKd(mI13ylCe+E!&de|0
z_swsAkKGZe*^s?FZ@I-{$qrQpqIk_SXXY~e?yagmiI<0rV7*a`;zm2KK}(s48Xysp
z`2>tYUQD%|fL@Db>18QaZ`6mYfq-NiZ(?joS+$tMTar|Hp$Qs9158MYkG%fbAW2A~
zk9^7zro*ZqHcFKp8m#T8i3uG|f=47viV1HLU;!B#Jdu=}6&)mf<cu!Bd(%vj#0<n}
z@{zMn)rTX5A8C+q*f^^|GYsK$+8DdT>12usmS$Lr#*fp=*nz_dSQjxjNPL?n#z8bt
zF?Sa}`N&4YPyt1?x3}BcIUCXv6yx!DObwQ`VuV#sDF&akDtbX$ApmtjlT<@O3Spl4
z2GnZ!NHYBivN|uT=yPGh0i%+<N-;K?N&`h<9;dcy%`=ya0tK6)3>8DiScY048V=uE
zR+i_{x)Fu(d!zMON`+Ju>Znx{aFXK%CRqi34e|!kVhA;-BOYl)2GSdmO89G?#JVsq
zNQ!BAbO8ef@br;5{+yL&tqdDuIKa|?W399s(DW=cj6^A(S_pNTP?iC94`663?Yaxa
z$rpKp|6i~ufH=}*9%n!@>y=WK#Ee8Z3_^--@QMIK0UwDiHc1iz>!!=>F1O2H?hi6d
zkS%wy75;#OD|6X{L55}1+yD|<%{-*J;$5zLQLb6hvuvnIZBVSxkW9>E14xVe;#l05
zS+2OaFV01|6n2LCPras1xCzYdeD~qQeE&iPH?4-dvpB!5&0<;dOejzmt30-UbfoIb
z($&i*ynAC!2R2^)e7yfiH0$-q&aTJ4-=I!C{^_qv4zClRyi}F*L&m$AZ?AV14`1I`
zPGoUwxzQI8ck^P2yw|;ApmR*wQ#$&xFra{yyE3{uD*S&>+}Sa7I?{Cf?C%%2;qBw+
z*2sgS1v#sp`)19FZI#{0DWWi^Ffl>@(Q~G3<mTqAjI)C~PYu{_4E~gTdy*wzZ0UFI
z<G#M*x!BiT)HhW4+LdPerrj+?dp_zPSKn#?+owRUYxvuTUmeqvTf4j||3NUlqUM#g
zXm{PQ>1z+T5BJ+XdH>@>D|1IjhT0CGYo$l0JJ$bI_uZD`lP^`Xy(h2SsOTY%<`(K*
z=WqY^%NM7&^pr+?5B4OapWit%ymf!xs?77<lh5Zqk{{Z3<mnVsIP3VXbDL_5HkNm0
z?L63bsro}N@xd+WmT&cYPb|I9zqu~|#~9yM`R3&}uKsy{P3WJoL#Hl$W&T7%!J0r{
I`Lmt>0&D*M%>V!Z
deleted file mode 100644
index 5019f2c7feb212b523422bd1b19a2860a4dc61f0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8e44c82d87094584b64dc0fad9cfde4bcf03857b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 60187c8489110652829f03ce7f9859c3db4ba95f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 41ad236a5663b71bc71f0304a11373668f73b129..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 09a0a9c3b4c6f138a44929eb5b5bc669774eb76b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 20a94d05bffb8f4fc3c19cb2df469dbce5b6d565..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7a7eb1b9333df27f51c37b3c5407889b7de27203..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 11fc7270128282ab94ca2dcce69b8eda7854c5b6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 54b476a58b790429e2876fefba7b5288b12222c1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/metro/theme/jar.mn
+++ b/browser/metro/theme/jar.mn
@@ -32,25 +32,18 @@ chrome.jar:
   skin/images/navbar-star@1.4x.png          (images/navbar-star@1.4x.png)
   skin/images/navbar-star@1.8x.png          (images/navbar-star@1.8x.png)
   skin/images/navbar-pin.png                (images/navbar-pin.png)
   skin/images/navbar-pin@1.4x.png           (images/navbar-pin@1.4x.png)
   skin/images/navbar-pin@1.8x.png           (images/navbar-pin@1.8x.png)
   skin/images/navbar-menu.png               (images/navbar-menu.png)
   skin/images/navbar-menu@1.4x.png          (images/navbar-menu@1.4x.png)
   skin/images/navbar-menu@1.8x.png          (images/navbar-menu@1.8x.png)
-  skin/images/urlbar-go.png                 (images/urlbar-go.png)
-  skin/images/urlbar-go@1.4x.png            (images/urlbar-go@1.4x.png)
-  skin/images/urlbar-go@1.8x.png            (images/urlbar-go@1.8x.png)
-  skin/images/urlbar-reload.png             (images/urlbar-reload.png)
-  skin/images/urlbar-reload@1.4x.png        (images/urlbar-reload@1.4x.png)
-  skin/images/urlbar-reload@1.8x.png        (images/urlbar-reload@1.8x.png)
-  skin/images/urlbar-stop.png               (images/urlbar-stop.png)
-  skin/images/urlbar-stop@1.4x.png          (images/urlbar-stop@1.4x.png)
-  skin/images/urlbar-stop@1.8x.png          (images/urlbar-stop@1.8x.png)
+  skin/images/appbar-reload.png             (images/appbar-reload.png)
+  skin/images/appbar-stop.png               (images/appbar-stop.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)