Back out 197bf80d62f8 (bug 1230638) for failures in browser_967000_button_sync.js
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 22 Jan 2016 23:33:04 -0800
changeset 281390 ab602ecfad88669fdf4d2174a8d74324eb1cf5d6
parent 281389 d5330fa5e4cae235932123c392a29df1b1678f8b
child 281391 76a10b1ae6abce425b0bca991be85662e5219a77
push id29935
push userphilringnalda@gmail.com
push dateSun, 24 Jan 2016 02:12:02 +0000
treeherdermozilla-central@a2e81822194a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1230638
milestone46.0a1
backs out197bf80d62f8f8fb123b9581a236a9cbcfd78094
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
Back out 197bf80d62f8 (bug 1230638) for failures in browser_967000_button_sync.js CLOSED TREE
browser/extensions/pocket/jar.mn
browser/extensions/pocket/skin/linux/Toolbar-inverted.png
browser/extensions/pocket/skin/linux/Toolbar.png
browser/extensions/pocket/skin/linux/menuPanel.png
browser/extensions/pocket/skin/linux/menuPanel@2x.png
browser/extensions/pocket/skin/linux/pocket.css
browser/extensions/pocket/skin/osx/Toolbar-inverted.png
browser/extensions/pocket/skin/osx/Toolbar-inverted@2x.png
browser/extensions/pocket/skin/osx/Toolbar-yosemite.png
browser/extensions/pocket/skin/osx/Toolbar-yosemite@2x.png
browser/extensions/pocket/skin/osx/Toolbar.png
browser/extensions/pocket/skin/osx/Toolbar@2x.png
browser/extensions/pocket/skin/osx/menuPanel-yosemite.png
browser/extensions/pocket/skin/osx/menuPanel-yosemite@2x.png
browser/extensions/pocket/skin/osx/menuPanel.png
browser/extensions/pocket/skin/osx/menuPanel@2x.png
browser/extensions/pocket/skin/osx/pocket.css
browser/extensions/pocket/skin/shared/pocket.css
browser/extensions/pocket/skin/windows/Toolbar-XP.png
browser/extensions/pocket/skin/windows/Toolbar-aero.png
browser/extensions/pocket/skin/windows/Toolbar-aero@2x.png
browser/extensions/pocket/skin/windows/Toolbar-inverted.png
browser/extensions/pocket/skin/windows/Toolbar-inverted@2x.png
browser/extensions/pocket/skin/windows/Toolbar-lunaSilver.png
browser/extensions/pocket/skin/windows/Toolbar-win8.png
browser/extensions/pocket/skin/windows/Toolbar-win8@2x.png
browser/extensions/pocket/skin/windows/Toolbar.png
browser/extensions/pocket/skin/windows/Toolbar@2x.png
browser/extensions/pocket/skin/windows/menuPanel-aero.png
browser/extensions/pocket/skin/windows/menuPanel-aero@2x.png
browser/extensions/pocket/skin/windows/menuPanel.png
browser/extensions/pocket/skin/windows/menuPanel@2x.png
browser/extensions/pocket/skin/windows/pocket.css
--- a/browser/extensions/pocket/jar.mn
+++ b/browser/extensions/pocket/jar.mn
@@ -5,28 +5,8 @@
 [features/firefox@getpocket.com] chrome.jar:
 % content pocket %content/ contentaccessible=yes
 % skin pocket classic/1.0 %skin/linux/ os=Linux
 % skin pocket classic/1.0 %skin/osx/ os=Darwin
 % skin pocket classic/1.0 %skin/windows/ os=WINNT
 % skin pocket-shared classic/1.0 %skin/shared/
   content/  (content/*)
   skin/  (skin/*)
-# windows overrides
-% override chrome://pocket/skin/menuPanel.png             chrome://pocket/skin/menuPanel-aero.png            os=WINNT osversion=6
-% override chrome://pocket/skin/menuPanel.png             chrome://pocket/skin/menuPanel-aero.png            os=WINNT osversion=6.1
-% override chrome://pocket/skin/menuPanel@2x.png          chrome://pocket/skin/menuPanel-aero@2x.png         os=WINNT osversion=6
-% override chrome://pocket/skin/menuPanel@2x.png          chrome://pocket/skin/menuPanel-aero@2x.png         os=WINNT osversion=6.1
-% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-aero@2x.png           os=WINNT osversion=6
-% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-aero@2x.png           os=WINNT osversion=6.1
-% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-win8@2x.png           os=WINNT osversion=6.2
-% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-win8@2x.png           os=WINNT osversion=6.3
-% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-XP.png                os=WINNT osversion<6
-% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-aero.png              os=WINNT osversion=6
-% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-aero.png              os=WINNT osversion=6.1
-% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-win8.png              os=WINNT osversion=6.2
-% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-win8.png              os=WINNT osversion=6.3
-# osx overrides
-% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-yosemite.png          os=Darwin osversion>=10.10
-% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-yosemite@2x.png       os=Darwin osversion>=10.10
-% override chrome://pocket/skin/menuPanel.png             chrome://pocket/skin/menuPanel-yosemite.png        os=Darwin osversion>=10.10
-% override chrome://pocket/skin/menuPanel@2x.png          chrome://pocket/skin/menuPanel-yosemite@2x.png     os=Darwin osversion>=10.10
-
deleted file mode 100644
index 68f5125eace5f750483319a510e1ca08d805e267..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index be9b0e6d23b77c2e56885a49e445b2aa2bf905c5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 55bc46cc96142a40ab7e8d7829336ab0d2e47974..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ad13ca4ce7b9f348e51d9fc7eda9b5331df1b2f3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/extensions/pocket/skin/linux/pocket.css
+++ b/browser/extensions/pocket/skin/linux/pocket.css
@@ -1,10 +1,1 @@
 @import url("chrome://pocket-shared/skin/pocket.css");
-
-#nav-bar #pocket-button > .toolbarbutton-icon {
-  padding: 2px 6px;
-}
-
-:-moz-any(#TabsToolbar, .widget-overflow-list) #pocket-button > .toolbarbutton-icon {
-    max-width: 18px;
-    padding: 0;
-}
\ No newline at end of file
deleted file mode 100644
index 0f4d57b4e5682c5ea6e669e0b348e1c77afee58c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 03c3b42d5d8b990dc6e924bdc487c07918d3dca1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 28602b1866c18e46831f3e06956d76a0e27e8a01..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 53040cb46438283bb6158f4763727a9711b01226..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1a8d7a51c5aed5e34c90df6daebaf12c770f9fcc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 91bf3ef6f2ea5e6436b6300c3efbf74106d4e0ca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 30b475cc0996219a33b43501ee14d440499a41c5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 389d96ec76cc5f18db1cd590bed127b5c70d7d0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d2bf61888234f8510a7616bc52577695604f2982..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f58afbc4dac8c50672466d070ffd9df71b5bef03..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/extensions/pocket/skin/osx/pocket.css
+++ b/browser/extensions/pocket/skin/osx/pocket.css
@@ -1,27 +1,22 @@
 @import url("chrome://pocket-shared/skin/pocket.css");
 
-#pocket-button[cui-areatype="toolbar"] > .toolbarbutton-icon {
-  max-width: 18px;
-  margin: 0;
-}
-
 #pocket-button[cui-areatype="toolbar"][open] {
-  -moz-image-region: rect(36px, 18px, 54px, 0);
+  -moz-image-region: rect(36px, 774px, 54px, 756px);
 }
 
 @media (min-resolution: 1.1dppx) {
 
   #pocket-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 36px, 36px, 0);
+    -moz-image-region: rect(0, 1548px, 36px, 1512px);
   }
 
   #pocket-button[cui-areatype="toolbar"][open] {
-    -moz-image-region: rect(72px, 36px, 108px, 0);
+    -moz-image-region: rect(72px, 1548px, 108px, 1512px);
   }
 }
 
 @media (min-resolution: 2dppx) {
   #panelMenu_pocket,
   #menu_pocket,
   #BMB_pocket {
     list-style-image: url("chrome://pocket/content/panels/img/pocketmenuitem16@2x.png");
@@ -29,17 +24,17 @@
 
   #panelMenu_pocket > .toolbarbutton-icon {
     width: 16px;
   }
 }
 
 @media not all and (min-resolution: 1.1dppx) {
   #pocket-button:hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"]) {
-    -moz-image-region: rect(18px, 18px, 36px, 0);
+    -moz-image-region: rect(18px, 774px, 36px, 756px);
   }
 }
 
 @media (min-resolution: 1.1dppx) {
   #pocket-button:hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"]) {
-    -moz-image-region: rect(36px, 36px, 72px, 0);
+    -moz-image-region: rect(36px, 1548px, 72px, 1512px);
   }
 }
--- a/browser/extensions/pocket/skin/shared/pocket.css
+++ b/browser/extensions/pocket/skin/shared/pocket.css
@@ -9,61 +9,60 @@ panelmultiview[mainViewId=PanelUI-pocket
 }
 
 #PanelUI-pocketView > .panel-subview-body,
 #PanelUI-pocketView {
   overflow: visible;
 }
 
 #pocket-button {
-  list-style-image: url("chrome://pocket/skin/Toolbar.png");
-  -moz-image-region: rect(0, 18px, 18px, 0);
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
 toolbar[brighttext] #pocket-button {
-  list-style-image: url(chrome://pocket/skin/Toolbar-inverted.png);
+  list-style-image: url(chrome://browser/skin/Toolbar-inverted.png);
 }
 
 @media not all and (min-resolution: 1.1dppx) {
   #pocket-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #pocket-button {
-    list-style-image: url(chrome://pocket/skin/menuPanel.png);
-    -moz-image-region: rect(0, 32px, 32px, 0);
+    list-style-image: var(--menupanel-list-style-image);
+    -moz-image-region: rect(0px, 992px, 32px, 960px);
   }
 
   #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-    -moz-image-region: rect(32px, 32px, 64px, 0);
+    -moz-image-region: rect(32px, 992px, 64px, 960px);
   }
 }
 
 @media (min-resolution: 1.1dppx) {
   #pocket-button {
-    list-style-image: url("chrome://pocket/skin/Toolbar@2x.png");
+    list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
   }
 
   toolbar[brighttext] #pocket-button {
-    list-style-image: url("chrome://pocket/skin/Toolbar-inverted@2x.png");
+    list-style-image: url("chrome://browser/skin/Toolbar-inverted@2x.png");
   }
 
   #pocket-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #pocket-button {
-    list-style-image: url(chrome://pocket/skin/menuPanel@2x.png);
-    -moz-image-region: rect(0px, 64px, 64px, 0);
+    list-style-image: var(--menupanel-list-style-image-2x);
+    -moz-image-region: rect(0px, 1984px, 64px, 1920px);
   }
 
   #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-    -moz-image-region: rect(64px, 64px, 128px, 0);
+    -moz-image-region: rect(64px, 1984px, 128px, 1920px);
   }
 }
 
 #pocket-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 18px, 18px, 0);
+  -moz-image-region: rect(0, 774px, 18px, 756px);
 }
 
 #pocket-button[cui-areatype="toolbar"][open] {
-  -moz-image-region: rect(18px, 18px, 36px, 0);
+  -moz-image-region: rect(18px, 774px, 36px, 756px);
 }
 
 #panelMenu_pocket,
 #menu_pocket,
 #BMB_pocket {
   list-style-image: url("chrome://pocket/content/panels/img/pocketmenuitem16.png");
 }
deleted file mode 100644
index 9220a207faefd653017315a6bda83708f619a88d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7b373acb9792624e19515563be79877b9fe5b210..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6e83dcc60a48694290a23c52fe515aed0c2fab53..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 70e95f464b83f4b87817bc5e2182a4b12304d460..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ba0b7e2af7e0ad372df1e93f087b0e59f920cccc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5afe7ca44acb0270207c47e6a1c73d09b48ce221..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 208dc03ae8348eff4e8aa5a42023ed8f0223d218..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3704f08851884ddc5a193e8d58b371e9b62aadcb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4801961f8d660a0a325d2e4ff25c016e8eb01b91..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f3a1cc738b3b847ee0e84929027dedc0d52e1eb6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 459e826349276ce10fb3dee25aa93d223ffa1a3c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index eef525741f5857312bd12f8d55ac97c70e9e2506..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 55bc46cc96142a40ab7e8d7829336ab0d2e47974..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ad13ca4ce7b9f348e51d9fc7eda9b5331df1b2f3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/extensions/pocket/skin/windows/pocket.css
+++ b/browser/extensions/pocket/skin/windows/pocket.css
@@ -1,26 +1,11 @@
 @import url("chrome://pocket-shared/skin/pocket.css");
 
-#nav-bar #pocket-button > .toolbarbutton-icon {
-  padding: 2px 6px;
-}
-
-:-moz-any(#TabsToolbar, .widget-overflow-list) #pocket-button > .toolbarbutton-icon {
-    max-width: 18px;
-    padding: 0;
-}
-
-@media (-moz-windows-theme: luna-silver) and (max-resolution: 1dppx) {
-  #pocket-button {
-    list-style-image: url(chrome://pocket/skin/toolbar-lunaSilver.png)
-  }
-}
-
 @media (min-resolution: 1.1dppx) {
   #pocket-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 36px, 36px, 0px);
+    -moz-image-region: rect(0, 1548px, 36px, 1512px);
   }
 
   #pocket-button[cui-areatype="toolbar"][open] {
-    -moz-image-region: rect(36px, 36px, 72px, 0px);
+    -moz-image-region: rect(36px, 1548px, 72px, 1512px);
   }
 }