Backed out changeset c4376773f9cd (bug 1377184) for failing browser-c…

…hrome's browser_startup_images.js: chevron.svg should have been shown. r=backout

browser/base/content/browser.xul

@@ -1116,7 +1116,7 @@
                        flex="1"/>
             <toolbarbutton type="menu"
                            id="PlacesChevron"
-                           class="toolbarbutton-1"
+                           class="chevron"
                            mousethrough="never"
                            collapsed="true"
                            tooltiptext="&bookmarksToolbarChevron.tooltip;"

browser/base/content/test/performance/browser_startup_images.js

@@ -87,8 +87,14 @@ const whitelist = [
   },
 
   {
-    file: "chrome://global/skin/toolbar/chevron.svg",
-    platforms: ["win", "linux", "macosx"],
+    file: "chrome://global/skin/icons/chevron.png",
+    hidpi: "chrome://global/skin/icons/[email protected]",
+    platforms: ["macosx"],
+  },
+
+  {
+    file: "chrome://global/skin/toolbar/chevron.gif",
+    platforms: ["win", "linux"],
   },
 
   {

browser/themes/linux/browser.css

@@ -812,6 +812,28 @@ html|span.ac-emphasize-text-url {
   font-weight: bold;
 }
 
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
+}
+
+toolbar[brighttext] toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
+}
+
+toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+toolbarbutton.chevron > .toolbarbutton-text,
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-icon {
+  margin: 0;
+}
+
 /* Status panel */
 
 .statuspanel-label {

browser/themes/osx/browser.css

@@ -195,6 +195,38 @@
   -moz-box-align: center;
 }
 
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/icons/chevron.png");
+  margin: 1px 0 0;
+  padding: 0;
+}
+
+toolbar[brighttext] toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/icons/chevron-inverted.png");
+}
+
+toolbarbutton.chevron > .toolbarbutton-text {
+  display: none;
+}
+
+toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+@media (min-resolution: 2dppx) {
+  toolbarbutton.chevron {
+    list-style-image: url("chrome://global/skin/icons/[email protected]");
+  }
+
+  toolbar[brighttext] toolbarbutton.chevron {
+    list-style-image: url("chrome://global/skin/icons/[email protected]");
+  }
+
+  toolbarbutton.chevron > .toolbarbutton-icon {
+    width: 13px;
+  }
+}
+
 /* ----- BOOKMARK BUTTONS ----- */
 
 .bookmark-item[container] {
@@ -1040,6 +1072,10 @@ html|span.ac-emphasize-text-url {
   text-shadow: none;
 }
 
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 .bookmark-item {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
 }

browser/themes/shared/tabs.inc.css

@@ -443,6 +443,9 @@
 #TabsToolbar > #new-tab-button ,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button {
   list-style-image: url(chrome://browser/skin/tabbrowser/newtab.svg);
+  -moz-context-properties: fill;
+  fill: currentColor;
+  color: inherit;
 }
 
 .tabs-newtab-button {
@@ -463,6 +466,8 @@
 
 #alltabs-button {
   list-style-image: url(chrome://browser/skin/arrow-dropdown-16.svg);
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {

browser/themes/shared/toolbarbutton-icons.inc.css

@@ -300,7 +300,6 @@ toolbar:not([brighttext]) #bookmarks-menu-button[starred] > .toolbarbutton-menub
   list-style-image: url("chrome://browser/skin/zoom-in.svg");
 }
 
-#PlacesChevron,
 #nav-bar-overflow-button {
   list-style-image: url("chrome://browser/skin/chevron.svg");
 }

browser/themes/shared/toolbarbuttons.inc.css

@@ -11,8 +11,8 @@
   --backbutton-background: hsla(0,100%,100%,.8);
   --backbutton-hover-background: var(--backbutton-background);
   --backbutton-active-background: var(--toolbarbutton-active-background);
-  --backbutton-border-color: hsla(240,5%,5%,.3);
 
+  --backbutton-border-color: hsla(240,5%,5%,.3);
   /* This default value of --toolbarbutton-height is defined to prevent
      CSS errors for an invalid variable. The value should not get used,
      as a more specific value should be set when the value will be used. */
@@ -49,8 +49,8 @@ toolbar[brighttext] {
   margin-inline-end: 0;
 }
 
-.toolbarbutton-1 > .toolbarbutton-icon,
-.toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon {
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon {
   max-width: 16px;
 }
 
@@ -60,6 +60,7 @@ toolbar[brighttext] {
   margin: 0 0 var(--tab-toolbar-navbar-overlap);
 }
 
+#TabsToolbar .toolbarbutton-1,
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
   -moz-appearance: none;
@@ -88,48 +89,49 @@ toolbar[brighttext] {
   padding: 0;
 }
 
-toolbar .toolbarbutton-1 {
+#nav-bar .toolbarbutton-1 {
   -moz-appearance: none;
   margin: 0;
   padding: 0 2px;
   -moz-box-pack: center;
 }
 
-#PanelUI-menu-button {
+#nav-bar #PanelUI-menu-button {
   padding-inline-start: 5px;
   padding-inline-end: 5px;
 }
 
-toolbar .toolbarbutton-1 > menupopup {
+#nav-bar .toolbarbutton-1 > menupopup {
   margin-top: -3px;
 }
 
-toolbar .toolbarbutton-1 > menupopup.cui-widget-panel {
+#nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel {
   margin-top: -8px;
 }
 
 .findbar-button > .toolbarbutton-text,
 toolbarbutton.bookmark-item:not(.subviewbutton),
-toolbar .toolbarbutton-1 > .toolbarbutton-icon,
-toolbar .toolbarbutton-1 > .toolbarbutton-text,
-toolbar .toolbarbutton-1 > .toolbarbutton-badge-stack {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack {
   padding: var(--toolbarbutton-inner-padding);
   border-radius: var(--toolbarbutton-border-radius);
   transition-property: background-color, border-color, box-shadow;
   transition-duration: 150ms;
 }
 
-toolbar .toolbarbutton-1 > .toolbarbutton-icon {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-icon {
   /* horizontal padding + actual icon width */
   max-width: calc(2 * var(--toolbarbutton-inner-padding) + 16px);
 }
 
 .bookmark-item > .toolbarbutton-menu-dropmarker,
-toolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-toolbar .toolbarbutton-1 > .toolbarbutton-text {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-text {
   padding-top: var(--toolbarbutton-vertical-text-padding);
   padding-bottom: 0;
   /* To make the hover feedback line up with sibling buttons, it needs the same
@@ -139,17 +141,17 @@ toolbar .toolbarbutton-1 > .toolbarbutton-text {
   min-height: calc(16px + 2 * var(--toolbarbutton-inner-padding));
 }
 
-toolbar .toolbaritem-combined-buttons {
+#nav-bar .toolbaritem-combined-buttons {
   margin-left: 2px;
   margin-right: 2px;
 }
 
-toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
+#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1 {
   padding-left: 0;
   padding-right: 0;
 }
 
-toolbar .toolbaritem-combined-buttons:not(:hover) > separator {
+#nav-bar .toolbaritem-combined-buttons:not(:hover) > separator {
   content: "";
   display: -moz-box;
   width: 1px;
@@ -162,33 +164,35 @@ toolbar .toolbaritem-combined-buttons:not(:hover) > separator {
   opacity: .2;
 }
 
-toolbar[brighttext] .toolbaritem-combined-buttons > separator {
+#nav-bar[brighttext] .toolbaritem-combined-buttons > separator {
   opacity: .3;
 }
 
+#TabsToolbar .toolbarbutton-1:not([disabled=true]):hover,
+#TabsToolbar .toolbarbutton-1[open],
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled=true]):hover,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled=true]):hover,
 .findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text,
 toolbarbutton.bookmark-item:not(.subviewbutton):hover:not([disabled="true"]):not([open]),
-toolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
-toolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
-toolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack {
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack {
   background-color: var(--toolbarbutton-hover-background);
   color: inherit;
 }
 
 .findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active) > .toolbarbutton-text,
 toolbarbutton.bookmark-item:not(.subviewbutton):hover:active:not([disabled="true"]),
 toolbarbutton.bookmark-item[open="true"],
-toolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
-toolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
-toolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: var(--toolbarbutton-active-background);
   transition-duration: 10ms;
   color: inherit;
 }
 
-toolbar .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
+#nav-bar .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
   background-color: var(--toolbarbutton-hover-background);
   transition: background-color .4s;
 }

browser/themes/windows/browser.css

@@ -1045,6 +1045,28 @@ treechildren.searchbar-treebody::-moz-tree-row(selected) {
   font-weight: bold;
 }
 
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
+}
+
+toolbar[brighttext] toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
+}
+
+toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+toolbarbutton.chevron > .toolbarbutton-text,
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-icon {
+  margin: 0;
+}
+
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
   list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);

toolkit/themes/osx/global/jar.mn

@@ -75,6 +75,10 @@ toolkit.jar:
   skin/classic/global/icons/autoscroll.png                           (icons/autoscroll.png)
   skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
+  skin/classic/global/icons/chevron.png                              (icons/chevron.png)
+  skin/classic/global/icons/chevron-inverted.png                     (icons/chevron-inverted.png)
+  skin/classic/global/icons/[email protected]                           (icons/[email protected])
+  skin/classic/global/icons/[email protected]                  (icons/[email protected])
   skin/classic/global/icons/glyph-dropdown.png                       (icons/glyph-dropdown.png)
   skin/classic/global/icons/[email protected]                    (icons/[email protected])
   skin/classic/global/icons/menulist-dropmarker.png                  (icons/menulist-dropmarker.png)

toolkit/themes/shared/non-mac.jar.inc.mn

@@ -51,6 +51,8 @@
   skin/classic/global/splitter/grip-top.gif                (../../windows/global/splitter/grip-top.gif)
   skin/classic/global/splitter/grip-left.gif               (../../windows/global/splitter/grip-left.gif)
   skin/classic/global/splitter/grip-right.gif              (../../windows/global/splitter/grip-right.gif)
+  skin/classic/global/toolbar/chevron.gif                  (../../windows/global/toolbar/chevron.gif)
+  skin/classic/global/toolbar/chevron-inverted.png         (../../windows/global/toolbar/chevron-inverted.png)
   skin/classic/global/tree/columnpicker.gif                (../../windows/global/tree/columnpicker.gif)
   skin/classic/global/tree/sort-asc.png                    (../../windows/global/tree/sort-asc.png)
   skin/classic/global/tree/sort-dsc.png                    (../../windows/global/tree/sort-dsc.png)