Backed out 2 changesets (bug 1695292, bug 1696438) for causing xpcshell failures in test_trr_cancel.js

CLOSED TREE

Backed out changeset 48c2e15e0472 (bug 1695292)
Backed out changeset 4b1eb7d5fe2d (bug 1696438)
This commit is contained in:
Alexandru Michis 2021-04-06 19:20:34 +03:00
Родитель 6cc119870c
Коммит 0a0ec7a076
2 изменённых файлов: 7 добавлений и 27 удалений

Просмотреть файл

@ -1328,7 +1328,7 @@
_positionPinnedTabs() {
let tabs = this._getVisibleTabs();
let numPinned = gBrowser._numPinnedTabs;
let numPinned = tabs.filter(t => t.pinned).length;
let doPosition =
this.getAttribute("overflow") == "true" &&
tabs.length > numPinned &&
@ -1343,15 +1343,13 @@
let uiDensity = document.documentElement.getAttribute("uidensity");
if (!layoutData || layoutData.uiDensity != uiDensity) {
let arrowScrollbox = this.arrowScrollbox;
let firstTab = tabs[0];
let firstTabCS = getComputedStyle(firstTab);
layoutData = this._pinnedTabsLayoutCache = {
uiDensity,
pinnedTabWidth: tabs[0].getBoundingClientRect().width,
scrollStartOffset:
arrowScrollbox.scrollbox.getBoundingClientRect().left -
arrowScrollbox.getBoundingClientRect().left +
parseFloat(
getComputedStyle(arrowScrollbox.scrollbox).paddingInlineStart
),
pinnedTabWidth: parseFloat(firstTabCS.width),
scrollButtonWidth: arrowScrollbox._scrollButtonDown.getBoundingClientRect()
.width,
};
}
@ -1361,7 +1359,7 @@
width += layoutData.pinnedTabWidth;
tab.style.setProperty(
"margin-inline-start",
-(width + layoutData.scrollStartOffset) + "px",
-(width + layoutData.scrollButtonWidth) + "px",
"important"
);
tab._pinnedUnscrollable = true;

Просмотреть файл

@ -105,7 +105,6 @@
width: 12px;
}
@media not (-moz-proton) {
#TabsToolbar .toolbarbutton-1,
#tabbrowser-arrowscrollbox::part(scrollbutton-up),
#tabbrowser-arrowscrollbox::part(scrollbutton-down) {
@ -117,7 +116,6 @@
appearance: none;
padding: 0 var(--toolbarbutton-inner-padding) !important;
}
} /*** END !proton ***/
#navigator-toolbox:not(:hover) #tabbrowser-arrowscrollbox:not([highlight])::part(scrollbutton-down) {
transition: 1s background-color ease-out;
@ -134,20 +132,6 @@ toolbar .toolbarbutton-1 {
-moz-box-pack: center;
}
@media (-moz-proton) {
#TabsToolbar .toolbarbutton-1 {
margin: 0 0 var(--tabs-navbar-shadow-size) !important;
}
#tabbrowser-arrowscrollbox::part(scrollbutton-up),
#tabbrowser-arrowscrollbox::part(scrollbutton-down) {
appearance: none;
margin: 4px;
padding: var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) - 4px);
border-radius: var(--tab-border-radius);
}
} /*** END proton ***/
@media not (-moz-proton) {
:root:not([uidensity=compact]) #PanelUI-button {
padding-inline-start: 5px;
@ -243,8 +227,6 @@ toolbar .toolbarbutton-1:not([disabled=true], [checked], [open], :active):hover
}
#PersonalToolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active),
#tabbrowser-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover:active,
#tabbrowser-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover:active,
toolbarbutton.bookmark-item:hover:active:not(.subviewbutton, [disabled="true"]),
toolbarbutton.bookmark-item[open="true"],
toolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-icon,