Bug 1336217 - drop conditional inclusion of some OSX skin files because it's always true and drop unused images. r?dao draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 04 Feb 2017 19:33:46 +0100
changeset 478982 fd8ff5c56fc0f61ff6ac549a8023eca5291085b7
parent 478934 7aa5e444af0ff686714d6165bd0e7e6d1abd0970
child 544557 d12394a169e59f55b295dda5a375c1b8471039f5
push id44116
push userarchaeopteryx@coole-files.de
push dateSat, 04 Feb 2017 18:36:01 +0000
reviewersdao
bugs1336217
milestone54.0a1
Bug 1336217 - drop conditional inclusion of some OSX skin files because it's always true and drop unused images. r?dao MozReview-Commit-ID: GCCsWyXkL3U
browser/themes/osx/jar.mn
browser/themes/osx/places/toolbar-lion.png
browser/themes/osx/places/toolbar.png
browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon@2x.png
browser/themes/osx/toolbarbutton-dropmarker-lion.png
browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png
browser/themes/osx/toolbarbutton-dropmarker.png
browser/themes/osx/toolbarbutton-dropmarker@2x.png
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -41,16 +41,17 @@ browser.jar:
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/slowStartup-16.png
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar@2x.png
   skin/classic/browser/Toolbar-inverted.png
   skin/classic/browser/Toolbar-inverted@2x.png
   skin/classic/browser/toolbarbutton-dropmarker.png
+  skin/classic/browser/toolbarbutton-dropmarker@2x.png
   skin/classic/browser/urlbar-history-dropmarker.png
   skin/classic/browser/urlbar-history-dropmarker@2x.png
   skin/classic/browser/urlbar-popup-blocked.png
   skin/classic/browser/urlbar-popup-blocked@2x.png
   skin/classic/browser/webRTC-sharingDevice-menubar.png
   skin/classic/browser/webRTC-sharingDevice-menubar@2x.png
   skin/classic/browser/webRTC-sharingMicrophone-menubar.png
   skin/classic/browser/webRTC-sharingMicrophone-menubar@2x.png
@@ -115,16 +116,17 @@ browser.jar:
 * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
 * skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/social/services-16.png               (social/services-16.png)
   skin/classic/browser/social/services-16@2x.png            (social/services-16@2x.png)
   skin/classic/browser/social/services-64.png               (social/services-64.png)
   skin/classic/browser/social/services-64@2x.png            (social/services-64@2x.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png          (tabbrowser/alltabs-box-bkgnd-icon@2x.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted.png    (tabbrowser/alltabs-box-bkgnd-icon-inverted.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png (tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png)
   skin/classic/browser/tabbrowser/newtab.png                             (tabbrowser/newtab.png)
   skin/classic/browser/tabbrowser/newtab@2x.png                          (tabbrowser/newtab@2x.png)
   skin/classic/browser/tabbrowser/newtab-inverted.png                    (tabbrowser/newtab-inverted.png)
   skin/classic/browser/tabbrowser/newtab-inverted@2x.png                 (tabbrowser/newtab-inverted@2x.png)
   skin/classic/browser/tabbrowser/tab-active-middle.png                  (tabbrowser/tab-active-middle.png)
   skin/classic/browser/tabbrowser/tab-active-middle@2x.png               (tabbrowser/tab-active-middle@2x.png)
@@ -160,21 +162,16 @@ browser.jar:
   skin/classic/browser/sync-128.png
   skin/classic/browser/sync-desktopIcon.svg  (../shared/sync-desktopIcon.svg)
   skin/classic/browser/sync-horizontalbar.png
   skin/classic/browser/sync-horizontalbar@2x.png
   skin/classic/browser/sync-mobileIcon.svg  (../shared/sync-mobileIcon.svg)
   skin/classic/browser/syncProgress-horizontalbar.png
   skin/classic/browser/syncProgress-horizontalbar@2x.png
   skin/classic/browser/Toolbar-background-noise.png         (Toolbar-background-noise.png)
-  skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)
-  skin/classic/browser/toolbarbutton-dropmarker@2x.png      (toolbarbutton-dropmarker-lion@2x.png)
-  skin/classic/browser/lion/tabbrowser/alltabs-box-bkgnd-icon.png      (tabbrowser/alltabs-box-bkgnd-icon-lion.png)
-  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png        (tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png)
-  skin/classic/browser/lion/places/toolbar.png                         (places/toolbar-lion.png)
   skin/classic/browser/yosemite/Toolbar.png                            (Toolbar-yosemite.png)
   skin/classic/browser/yosemite/Toolbar@2x.png                         (Toolbar-yosemite@2x.png)
   skin/classic/browser/yosemite/menuPanel-customize.png                (menuPanel-customize-yosemite.png)
   skin/classic/browser/yosemite/menuPanel-customize@2x.png             (menuPanel-customize-yosemite@2x.png)
   skin/classic/browser/yosemite/menuPanel-exit.png                     (menuPanel-exit-yosemite.png)
   skin/classic/browser/yosemite/menuPanel-exit@2x.png                  (menuPanel-exit-yosemite@2x.png)
   skin/classic/browser/yosemite/menuPanel-help.png                     (menuPanel-help-yosemite.png)
   skin/classic/browser/yosemite/menuPanel-help@2x.png                  (menuPanel-help-yosemite@2x.png)
@@ -194,19 +191,16 @@ browser.jar:
   skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
 #endif
 
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 % override chrome://browser/skin/feeds/audioFeedIcon.png                   chrome://browser/skin/feeds/feedIcon.png
 % override chrome://browser/skin/feeds/audioFeedIcon16.png                 chrome://browser/skin/feeds/feedIcon16.png
 % override chrome://browser/skin/feeds/videoFeedIcon.png                   chrome://browser/skin/feeds/feedIcon.png
 % override chrome://browser/skin/feeds/videoFeedIcon16.png                 chrome://browser/skin/feeds/feedIcon16.png
-% override chrome://browser/skin/toolbarbutton-dropmarker.png              chrome://browser/skin/lion/toolbarbutton-dropmarker.png                 os=Darwin osversion>=10.7
-% override chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://browser/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
-% override chrome://browser/skin/places/toolbar.png                        chrome://browser/skin/lion/places/toolbar.png                           os=Darwin osversion>=10.7
 % override chrome://browser/skin/Toolbar.png                               chrome://browser/skin/yosemite/Toolbar.png                              os=Darwin osversion>=10.10
 % override chrome://browser/skin/Toolbar@2x.png                            chrome://browser/skin/yosemite/Toolbar@2x.png                           os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-customize.png                   chrome://browser/skin/yosemite/menuPanel-customize.png                  os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-customize@2x.png                chrome://browser/skin/yosemite/menuPanel-customize@2x.png               os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-exit.png                        chrome://browser/skin/yosemite/menuPanel-exit.png                       os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-exit@2x.png                     chrome://browser/skin/yosemite/menuPanel-exit@2x.png                    os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-help.png                        chrome://browser/skin/yosemite/menuPanel-help.png                       os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-help@2x.png                     chrome://browser/skin/yosemite/menuPanel-help@2x.png                    os=Darwin osversion>=10.10
deleted file mode 100644
index ac3358c91bc00e87bd41e49e5cf9672ecd685103..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
index 168daf9cef766934a4be4a20c0db72ee8e36bc78..ac3358c91bc00e87bd41e49e5cf9672ecd685103
GIT binary patch
literal 1318
zc$@(y1=;$EP)<h;3K|Lk000e1NJLTq002+`000mO1^@s6fl2tm000E-Nkl<Zc-qaF
zZAhC}6vrnuzU!has8owXQPw&v_%1SyNEcB@{GhbMw_0afoUYvx=H}vT+Eg=*cCm>~
zVjG**YDBxjXq{l|Ms<_H94L%|!a!wT^@DzP{{tuNA)WQfmM|~;IC<{<-}{`L`*xDo
z_V@SyS6)#j!S8GjD*k+b1^A8af#oO#@Hi+JJU;=~*t!d~pWx5_oJ470VBm9D6I<y~
z58#P_fPf!iUjQT5*+C~;Dn@FDZV@)wp8=FeBqo@z!53ud`9B8`B^BHjp&KKuH_oS~
zrdGi`1l`~Puz()W!PY|c+&-3^oZJ8_9OF-Kc|`!v02c?ZgRP6}y$>KSUp-g~4i0`M
zLjMf>#C@b9^kmZ%3I#dY&#TVNE8sR;GuQW*m6c6EpW)$qx3_rsa2k999)s_|RpvVA
zV*4C?%evEt1`tI8T6oLc2i@V};bS5KG77ZRhx@hw$pLzyAIkjv{F~%>Y;5ev@bIu@
zZ*NaWmY%6TJ3D)jbiO=(IA}lc3hxEF$jC^0MMcG^QmJ%iWMnu|H{RCPHUw)W9qXSS
z=md%a%z!DL0X5JdfKCw(-QihMbKfZ*OL2gH0{jY=fD!cBY&HX}N^p#<)9LJ?)yFKc
zenK$Drnk8JCL|<0W<T3OXL@?NeRFfOizW(Gf~L8-IU}qb?L(~VN=izaekp(`r@#b9
zSI6Qu<|72qAtHcQ(hFz@Iv&#nPI>4b(b(V;Gq|v@06+dN>+9<&FgM*A)<5#a7M`7*
z?Fb7Cqod*qFwD%%Xd)saT6vOOAQHMbcEv)vkdP27>0Sz8d3m`!F)@+8&{sU*MWA9X
zVPLz60Nx_K8y@3h(4Uf$GF4SoRVdWw<>k@)to%+5xGt4Si-iFU4GqobGgZSnYgSg)
zH$J+BWqQ5d%$HTK!{JB@3JRjYX=`d~XeWdST<Ien>8am8ZQ<kK1EbMsiI0!B@xiSE
z=Rp$!Xb};>LD0y3E&?qkWyE5!+(LUJi1X<4KIkS23JUZzar^~}*y$oXPf|U#la8qs
zyz>ul@$ey|va)i7gZMLW@QR=0BV!r-LhaDmNq^WS^7hWoj=HtA^$xZz1>`aZ&?F*&
zeV_qciHeFcX*3%9?(Xhow7qpm4rbsl&<s8W)8GYJe!k#dB_#IkEsPm&Y}CQng&MV5
zP2XLO9bw$w-lq29y1Ke+V$&E2cxP>G?JBn2T}W?;JOgdW-fvV_S39=0wzR0r2geS%
zh2I5E&;&H4rKRL#D>zG5E|-(@YHl9|RlZK7OG-*;{BhtekusTV8cFnhl}cqp?wLYq
zRZ&sVXWk~#5#YV~`T0JaSL282b8>QAi;IiB_*@P`#W-&;8068>(f8<lqx1pwb$l~c
zlf`ob)l+*+Ow8!Oz<|OdkzV%}Palv%X*q+Sl167AxB#@PtE*>_16wJTD=aMh^56cH
ziv#CG=xTw?o7snrSy@@pn$6}RL7q1N&H*E9l+?bwyi5Uo!`EB5xVX5R-`T=9@I#;j
zdgQa;^Y3y^Zf<VRQT#1TpI-+j`H@zH3ucH`v_NwbMEm2<1e|y0vC5`!dERSoZoX?W
znLgjx*ih<py7v0|dRt~@<}lKi2S}(tJc<GIEW+El*57}G@K|qxPR<lcKr#p-%g;^R
co+k9+FA1)f{H_9Cg#Z8m07*qoM6N<$f+2l=ApigX
deleted file mode 100644
index 4d71308d278644ee9dda74ddac9207c0b1b26b3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
index 94a11fe5f9bf2b6b506de7e810893125d66b018c..4d71308d278644ee9dda74ddac9207c0b1b26b3b
GIT binary patch
literal 538
zc$@(m0_FXQP)<h;3K|Lk000e1NJLTq001)p000yS1^@s6AP5Dd0005uNkl<Zc-rlj
zze@sP9LBrzygV@rlEjRVB2zLWD8!Z$hyIMVh=P6${TL%CXpNwPhG;CJA!seCMFOcM
zS^^=Vr52HvhPUT|Z<AoxFR=39!^88u-;;Yd?)9xvO8ptCWqyLildn=O^W$YSpaTP#
zpcYtf&`WN}oL0$Ybl{W+_W~dAg8-FYa!cm)N-d)S2XKJ~DbNnOKsQx<K-OI{uT^Rp
zC-BHy=m33S5TvQ}lKW-OS+)$Wac}^3!48$4x!s4uwFGX#HMpYEGk>Ry3F<+sKRvnU
zPL3(h(5&*L<`tEmIoD;*EL)~fC`4kh*sPQqq0%$ATc%hn#v_r)7Vg~!YgBsXHr|XE
zw4UC*OeZI{?*pSps%7e2QR$gW8E@G)BWU@2z9$q4&EO$Msr1abZWAq+%MApB!A<<e
z29=)qJ7o;u0nN*2Dt>(PypovNf9#yQP*i&6T$ee+&NriHv)N=c8l9rjGyfotOeQlN
z4u{vN^fq=g2e3dRXj{Ed{fF77_0;rEo=VSL)-BH4-OZdJPNn}OCP+{}xHZ>-CJ@@V
zRJ~UZYJo~Gd0ho>%_W6Q;Fgcv#{yLGZduoV$8o0g6yPfP_y1*QGfmKmppoi9vs&iA
cm-!A}0h)`@YUO@9WdHyG07*qoM6N<$g0_nLLjV8(
rename from browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
rename to browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon@2x.png
deleted file mode 100644
index 09d80a1b25a84578587cc1d41afe6fd63dff2a93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
index f4cdb664ba95d3d36ea4074de8dc2e7c4696a931..09d80a1b25a84578587cc1d41afe6fd63dff2a93
GIT binary patch
literal 150
zc%17D@N?(olHy`uVBq!ia0vp^>_E)Q!3HEdXMMW?q+&f?978H@nRagEY%maTUHm{U
zT#6&gx_54CZ^VxN8@o^WPUPI=@W=ne!N;HPvEJ2-``9u2=>Iq`$zU&Wr7*GO?NQm&
zi|3tvb0s;s(8~YC-P%q=IUT>}7bT7y+4ha`t-O<^eCv-;phXOxu6{1-oD!M<-g!B*
rename from browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png
rename to browser/themes/osx/toolbarbutton-dropmarker@2x.png