From 9eeccb70ceae8f1f84de41c2ba10883cb6f891a3 Mon Sep 17 00:00:00 2001 From: Dorel Luca Date: Wed, 14 Apr 2021 23:30:14 +0300 Subject: [PATCH] Backed out changeset 00d6baae6487 (bug 1702285) for Browser-chrome in browser/base/content/test/performance/browser_tabopen.js. CLOSED TREE --- .../content/test/performance/browser_tabclose.js | 2 +- .../content/test/tabs/browser_audioTabIcon.js | 2 +- browser/themes/shared/jar.inc.mn | 1 + .../shared/tabbrowser/badge-audio-playing.svg | 16 ++++++++++++++++ .../tabbrowser/tab-audio-blocked-small.svg | 6 +++--- .../shared/tabbrowser/tab-audio-muted-small.svg | 9 +++------ .../tabbrowser/tab-audio-playing-small.svg | 7 +++---- browser/themes/shared/tabs.inc.css | 9 +++------ toolkit/themes/shared/icons/add.svg | 2 +- .../themes/shared/icons/arrow-dropdown-12.svg | 4 ++-- .../themes/shared/icons/arrow-dropdown-16.svg | 4 ++-- toolkit/themes/shared/icons/arrow-left.svg | 4 ++-- toolkit/themes/shared/icons/arrow-up-12.svg | 4 ++-- toolkit/themes/shared/icons/close.svg | 4 ++-- toolkit/themes/shared/icons/settings.svg | 5 ++--- 15 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 browser/themes/shared/tabbrowser/badge-audio-playing.svg diff --git a/browser/base/content/test/performance/browser_tabclose.js b/browser/base/content/test/performance/browser_tabclose.js index dc59440b9d37..c6d5ca1986ba 100644 --- a/browser/base/content/test/performance/browser_tabclose.js +++ b/browser/base/content/test/performance/browser_tabclose.js @@ -69,7 +69,7 @@ add_task(async function() { // The '+' icon moves with an animation. At the end of the animation // the former and new positions can touch each other causing the rect // to have twice the icon's width. - (r.h == 13 && r.w <= 2 * 13 + kMaxEmptyPixels) || + (r.h == 14 && r.w <= 2 * 14 + kMaxEmptyPixels) || // We sometimes have a rect for the right most 2px of the '+' button. (r.h == 2 && r.w == 2)) ) diff --git a/browser/base/content/test/tabs/browser_audioTabIcon.js b/browser/base/content/test/tabs/browser_audioTabIcon.js index f490aecbfc56..8e461ad0da76 100644 --- a/browser/base/content/test/tabs/browser_audioTabIcon.js +++ b/browser/base/content/test/tabs/browser_audioTabIcon.js @@ -256,7 +256,7 @@ async function test_playing_icon_on_hidden_tab(tab) { function assertIconShowing() { is( getComputedStyle(alltabsBadge).backgroundImage, - 'url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg")', + 'url("chrome://browser/skin/tabbrowser/badge-audio-playing.svg")', "The audio playing icon is shown" ); is( diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 1994c4f51be2..ef4dabd7e90f 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -225,6 +225,7 @@ skin/classic/browser/search-engine-placeholder@2x.png (../shared/search/search-engine-placeholder@2x.png) skin/classic/browser/search-indicator-badge-add.svg (../shared/search/search-indicator-badge-add.svg) + skin/classic/browser/tabbrowser/badge-audio-playing.svg (../shared/tabbrowser/badge-audio-playing.svg) skin/classic/browser/tabbrowser/crashed.svg (../shared/tabbrowser/crashed.svg) skin/classic/browser/tabbrowser/hourglass.svg (../shared/tabbrowser/hourglass.svg) skin/classic/browser/tabbrowser/indicator-tab-attention.svg (../shared/tabbrowser/indicator-tab-attention.svg) diff --git a/browser/themes/shared/tabbrowser/badge-audio-playing.svg b/browser/themes/shared/tabbrowser/badge-audio-playing.svg new file mode 100644 index 000000000000..f068d40094bb --- /dev/null +++ b/browser/themes/shared/tabbrowser/badge-audio-playing.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/browser/themes/shared/tabbrowser/tab-audio-blocked-small.svg b/browser/themes/shared/tabbrowser/tab-audio-blocked-small.svg index ac0d8151a72b..21d759ac940a 100644 --- a/browser/themes/shared/tabbrowser/tab-audio-blocked-small.svg +++ b/browser/themes/shared/tabbrowser/tab-audio-blocked-small.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg b/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg index 62724b0dcd2d..9807f683f8b8 100644 --- a/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg +++ b/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg @@ -1,10 +1,7 @@ - - - - - - + + + diff --git a/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg b/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg index e5f0149a0866..156e06163210 100644 --- a/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg +++ b/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg @@ -1,8 +1,7 @@ - - - - + + + diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css index 38cf97ea0fc1..3badfbec4855 100644 --- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -388,7 +388,6 @@ top: -4.5px; inset-inline-end: -9px; z-index: 1; /* Overlay tab title */ - padding: 2px; } @media not (-moz-proton) { @@ -396,7 +395,6 @@ top: -4.5px; inset-inline-end: -9px; z-index: 1; /* Overlay tab title */ - padding: 0; } } /*** END !proton ***/ @@ -434,7 +432,6 @@ .tab-icon-overlay@tabIndicatorReplacesIcon@ { border-radius: 2px; fill-opacity: 0.75; - padding: 2px; } .tab-icon-overlay@tabIndicatorReplacesIcon@:hover { background-color: color-mix(in srgb, currentColor 15%, transparent); @@ -527,14 +524,14 @@ margin-inline-end: calc(var(--inline-tab-padding) / -2); width: 24px; height: 24px; - padding: 7px; + padding: 5px; border-radius: var(--tab-border-radius); } /* The following rulesets allow showing more of the tab title */ .tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-close-button { padding-inline-start: 0; - width: 17px; + width: 19px; } .tabbrowser-tab[visuallyselected=true]:hover, @@ -1036,7 +1033,7 @@ } #tabbrowser-tabs[hiddensoundplaying] ~ #alltabs-button > .toolbarbutton-badge-stack > .toolbarbutton-badge { - background: transparent url(chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg); + background: transparent url(chrome://browser/skin/tabbrowser/badge-audio-playing.svg); box-shadow: none; /* Match the color of the button, rather than label default. */ color: inherit; diff --git a/toolkit/themes/shared/icons/add.svg b/toolkit/themes/shared/icons/add.svg index 1b0182f42728..3c1ccfd9cc8a 100644 --- a/toolkit/themes/shared/icons/add.svg +++ b/toolkit/themes/shared/icons/add.svg @@ -2,5 +2,5 @@ - 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/. --> - + diff --git a/toolkit/themes/shared/icons/arrow-dropdown-12.svg b/toolkit/themes/shared/icons/arrow-dropdown-12.svg index 6b9d465bc1c5..1a784357ce94 100644 --- a/toolkit/themes/shared/icons/arrow-dropdown-12.svg +++ b/toolkit/themes/shared/icons/arrow-dropdown-12.svg @@ -1,6 +1,6 @@ - - + + diff --git a/toolkit/themes/shared/icons/arrow-dropdown-16.svg b/toolkit/themes/shared/icons/arrow-dropdown-16.svg index 2a9c63322d94..7fa400549390 100644 --- a/toolkit/themes/shared/icons/arrow-dropdown-16.svg +++ b/toolkit/themes/shared/icons/arrow-dropdown-16.svg @@ -1,6 +1,6 @@ - - + + diff --git a/toolkit/themes/shared/icons/arrow-left.svg b/toolkit/themes/shared/icons/arrow-left.svg index 84029f99efa8..dee593186631 100644 --- a/toolkit/themes/shared/icons/arrow-left.svg +++ b/toolkit/themes/shared/icons/arrow-left.svg @@ -1,6 +1,6 @@ - - + + diff --git a/toolkit/themes/shared/icons/arrow-up-12.svg b/toolkit/themes/shared/icons/arrow-up-12.svg index 0663e18caac5..d881044a948a 100644 --- a/toolkit/themes/shared/icons/arrow-up-12.svg +++ b/toolkit/themes/shared/icons/arrow-up-12.svg @@ -1,6 +1,6 @@ - - + + diff --git a/toolkit/themes/shared/icons/close.svg b/toolkit/themes/shared/icons/close.svg index 85659eeeea3a..08e3832568de 100644 --- a/toolkit/themes/shared/icons/close.svg +++ b/toolkit/themes/shared/icons/close.svg @@ -1,6 +1,6 @@ - - + + diff --git a/toolkit/themes/shared/icons/settings.svg b/toolkit/themes/shared/icons/settings.svg index 8d8f791abef2..147be382eb6e 100644 --- a/toolkit/themes/shared/icons/settings.svg +++ b/toolkit/themes/shared/icons/settings.svg @@ -1,7 +1,6 @@ - - - + +