mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1415537 - Rename mTabstrip to arrowScrollbox. r=florian 

MozReview-Commit-ID: IcGH5npSsrg

--HG--
extra : rebase_source : faafb7bcf8044a924640ef6989e8b00111f9a277
This commit is contained in:
Dão Gottwald 2017-11-08 14:53:14 +01:00
Родитель 13cafd9d37
Коммит 04dd278456
5 изменённых файлов: 43 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
browser/base/content/tabbrowser.xml
Просмотреть файл

@ -3356,7 +3356,7 @@
focusAndSelectUrlBar();
// workaround for bug 345399
this.tabContainer.mTabstrip._updateScrollButtonsDisabledState();
this.tabContainer.arrowScrollbox._updateScrollButtonsDisabledState();
}
// We're going to remove the tab and the browser now.
@ -6440,7 +6440,7 @@
document.getElementById("tabContextMenu");
</field>
<field name="mTabstrip">
<field name="arrowScrollbox">
document.getAnonymousElementByAttribute(this, "anonid", "arrowscrollbox");
</field>
@ -6479,7 +6479,7 @@
return;
}
let tabstripWidth = this.mTabstrip.clientWidth;
let arrowScrollboxWidth = this.arrowScrollbox.clientWidth;
let newTabButton = document.getAnonymousElementByAttribute(
this, "anonid", "tabs-newtab-button");
@ -6495,7 +6495,7 @@
// Subtract the elements' widths from the available space to ensure
// that showing the restoreTabsButton won't cause any overflow.
if (tabstripWidth - tabbarUsedSpace > restoreTabsButtonWrapperWidth) {
if (arrowScrollboxWidth - tabbarUsedSpace > restoreTabsButtonWrapperWidth) {
restoreTabsButtonWrapper.setAttribute("shown", "true");
} else {
restoreTabsButtonWrapper.removeAttribute("shown");
@ -6720,7 +6720,7 @@
<parameter name="aInstant"/>
<body><![CDATA[
if (this.getAttribute("overflow") == "true")
this.mTabstrip.ensureElementIsVisible(this.selectedItem, aInstant);
this.arrowScrollbox.ensureElementIsVisible(this.selectedItem, aInstant);
this.selectedItem._notselectedsinceload = false;
]]></body>
@ -6753,7 +6753,7 @@
if (this.getAttribute("overflow") == "true") {
// Don't need to do anything if we're in overflow mode and aren't scrolled
// all the way to the right, or if we're closing the last tab.
if (isEndTab || !this.mTabstrip._scrollButtonDown.disabled)
if (isEndTab || !this.arrowScrollbox._scrollButtonDown.disabled)
return;
// If the tab has an owner that will become the active tab, the owner will
@ -6838,10 +6838,10 @@
let layoutData = this._pinnedTabsLayoutCache;
if (!layoutData) {
let tabstrip = this.mTabstrip;
let arrowScrollbox = this.arrowScrollbox;
layoutData = this._pinnedTabsLayoutCache = {
pinnedTabWidth: this.childNodes[0].getBoundingClientRect().width,
scrollButtonWidth: tabstrip._scrollButtonDown.getBoundingClientRect().width
scrollButtonWidth: arrowScrollbox._scrollButtonDown.getBoundingClientRect().width
};
}
@ -6908,7 +6908,7 @@
let tabScreenX = draggedTab.boxObject.screenX;
let translateX = screenX - draggedTab._dragData.screenX;
if (!pinned)
translateX += this.mTabstrip._scrollbox.scrollLeft - draggedTab._dragData.scrollX;
translateX += this.arrowScrollbox._scrollbox.scrollLeft - draggedTab._dragData.scrollX;
let leftBound = leftTab.boxObject.screenX - tabScreenX;
let rightBound = (rightTab.boxObject.screenX + rightTab.boxObject.width) -
(tabScreenX + tabWidth);
@ -7019,7 +7019,7 @@
</method>
<field name="_animateElement">
this.mTabstrip._scrollButtonDown;
this.arrowScrollbox._scrollButtonDown;
</field>
<method name="_notifyBackgroundTab">
@ -7028,7 +7028,7 @@
if (aTab.pinned || aTab.hidden)
return;
var scrollRect = this.mTabstrip.scrollClientRect;
var scrollRect = this.arrowScrollbox.scrollClientRect;
var tab = aTab.getBoundingClientRect();
// DOMRect left/right properties are immutable.
@ -7038,7 +7038,7 @@
if (scrollRect.left <= tab.left && tab.right <= scrollRect.right)
return;
if (this.mTabstrip.smoothScroll) {
if (this.arrowScrollbox.smoothScroll) {
let selected = !this.selectedItem.pinned &&
this.selectedItem.getBoundingClientRect();
@ -7046,13 +7046,13 @@
if (!selected ||
Math.max(tab.right - selected.left, selected.right - tab.left) <=
scrollRect.width) {
this.mTabstrip.ensureElementIsVisible(aTab);
this.arrowScrollbox.ensureElementIsVisible(aTab);
return;
}
this.mTabstrip.scrollByPixels(this.mTabstrip._isRTLScrollbox ?
selected.right - scrollRect.right :
selected.left - scrollRect.left);
this.arrowScrollbox.scrollByPixels(this.arrowScrollbox._isRTLScrollbox ?
selected.right - scrollRect.right :
selected.left - scrollRect.left);
}
if (!this._animateElement.hasAttribute("highlight")) {
@ -7155,7 +7155,7 @@
// if a tab was inserted to the overflow area or removed from it
// without any scrolling and when the tabbar has already
// overflowed.
this.mTabstrip._updateScrollButtonsDisabledState();
this.arrowScrollbox._updateScrollButtonsDisabledState();
// Preload the next about:newtab if there isn't one already.
this.tabbrowser._createPreloadBrowser();
@ -7448,7 +7448,7 @@
tab._dragData = {
offsetX: event.screenX - window.screenX - tabOffsetX,
offsetY: event.screenY - window.screenY,
scrollX: this.mTabstrip._scrollbox.scrollLeft,
scrollX: this.arrowScrollbox._scrollbox.scrollLeft,
screenX: event.screenX
};
@ -7466,7 +7466,7 @@
event.preventDefault();
event.stopPropagation();
var tabStrip = this.mTabstrip;
var arrowScrollbox = this.arrowScrollbox;
var ltr = (window.getComputedStyle(this).direction == "ltr");
// autoscroll the tab strip if we drag over the scroll
@ -7477,14 +7477,14 @@
var targetAnonid = event.originalTarget.getAttribute("anonid");
switch (targetAnonid) {
case "scrollbutton-up":
pixelsToScroll = tabStrip.scrollIncrement * -1;
pixelsToScroll = arrowScrollbox.scrollIncrement * -1;
break;
case "scrollbutton-down":
pixelsToScroll = tabStrip.scrollIncrement;
pixelsToScroll = arrowScrollbox.scrollIncrement;
break;
}
if (pixelsToScroll)
tabStrip.scrollByPixels((ltr ? 1 : -1) * pixelsToScroll, true);
arrowScrollbox.scrollByPixels((ltr ? 1 : -1) * pixelsToScroll, true);
}
if (effects == "move" &&
@ -7508,12 +7508,12 @@
}
}
var rect = tabStrip.getBoundingClientRect();
var rect = arrowScrollbox.getBoundingClientRect();
var newMargin;
if (pixelsToScroll) {
// if we are scrolling, put the drop indicator at the edge
// so that it doesn't jump while scrolling
let scrollRect = tabStrip.scrollClientRect;
let scrollRect = arrowScrollbox.scrollClientRect;
let minMargin = scrollRect.left - rect.left;
let maxMargin = Math.min(minMargin + scrollRect.width,
scrollRect.right);
@ -7671,7 +7671,7 @@
var wX = window.screenX;
// check if the drop point is horizontally within the window
if (eX > wX && eX < (wX + window.outerWidth)) {
let bo = this.mTabstrip.boxObject;
let bo = this.arrowScrollbox.boxObject;
// also avoid detaching if the the tab was dropped too close to
// the tabbar (half a tab)
let endScreenY = bo.screenY + 1.5 * bo.height;
@ -8250,7 +8250,7 @@
let windowUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
let tabstripRect = windowUtils.getBoundsWithoutFlushing(tabContainer.mTabstrip);
let arrowScrollboxRect = windowUtils.getBoundsWithoutFlushing(tabContainer.arrowScrollbox);
for (let menuitem of this.childNodes) {
let curTab = menuitem.tab;
if (!curTab) {
@ -8258,8 +8258,8 @@
continue;
}
let curTabRect = windowUtils.getBoundsWithoutFlushing(curTab);
if (curTabRect.left >= tabstripRect.left &&
curTabRect.right <= tabstripRect.right) {
if (curTabRect.left >= arrowScrollboxRect.left &&
curTabRect.right <= arrowScrollboxRect.right) {
menuitem.setAttribute("tabIsVisible", "true");
} else {
menuitem.removeAttribute("tabIsVisible");

2
browser/base/content/test/performance/browser_tabstrip_overflow_underflow_reflows.js
Просмотреть файл

@ -46,7 +46,7 @@ add_task(async function() {
false, e => e.propertyName === "max-width");
await switchDone;
await BrowserTestUtils.waitForCondition(() => {
return gBrowser.tabContainer.mTabstrip.hasAttribute("scrolledtoend");
return gBrowser.tabContainer.arrowScrollbox.hasAttribute("scrolledtoend");
});
}, EXPECTED_OVERFLOW_REFLOWS, window);

2
browser/base/content/test/performance/head.js
Просмотреть файл

@ -198,7 +198,7 @@ function computeMaxTabCount() {
document.getAnonymousElementByAttribute(gBrowser.tabContainer,
"anonid", "tabs-newtab-button");
let newTabRect = newTabButton.getBoundingClientRect();
let tabStripRect = gBrowser.tabContainer.mTabstrip.getBoundingClientRect();
let tabStripRect = gBrowser.tabContainer.arrowScrollbox.getBoundingClientRect();
let availableTabStripWidth = tabStripRect.width - newTabRect.width;
let tabMinWidth =

18
browser/base/content/test/tabs/browser_overflowScroll.js
Просмотреть файл

@ -7,29 +7,29 @@ requestLongerTimeout(2);
* amount in non-smoothscroll mode.
*/
add_task(async function() {
let tabstrip = gBrowser.tabContainer.mTabstrip;
let scrollbox = tabstrip._scrollbox;
let originalSmoothScroll = tabstrip.smoothScroll;
let arrowScrollbox = gBrowser.tabContainer.arrowScrollbox;
let scrollbox = arrowScrollbox._scrollbox;
let originalSmoothScroll = arrowScrollbox.smoothScroll;
let tabs = gBrowser.tabs;
let tabMinWidth = parseInt(getComputedStyle(gBrowser.selectedTab, null).minWidth);
let rect = ele => ele.getBoundingClientRect();
let width = ele => rect(ele).width;
let tabCountForOverflow = Math.ceil(width(tabstrip) / tabMinWidth * 3);
let tabCountForOverflow = Math.ceil(width(arrowScrollbox) / tabMinWidth * 3);
let left = ele => rect(ele).left;
let right = ele => rect(ele).right;
let isLeft = (ele, msg) => is(left(ele), left(scrollbox), msg);
let isRight = (ele, msg) => is(right(ele), right(scrollbox), msg);
let elementFromPoint = x => tabstrip._elementFromPoint(x);
let elementFromPoint = x => arrowScrollbox._elementFromPoint(x);
let nextLeftElement = () => elementFromPoint(left(scrollbox) - 1);
let nextRightElement = () => elementFromPoint(right(scrollbox) + 1);
let firstScrollable = () => tabs[gBrowser._numPinnedTabs];
tabstrip.smoothScroll = false;
arrowScrollbox.smoothScroll = false;
registerCleanupFunction(() => {
tabstrip.smoothScroll = originalSmoothScroll;
arrowScrollbox.smoothScroll = originalSmoothScroll;
});
while (tabs.length < tabCountForOverflow) {
@ -45,8 +45,8 @@ add_task(async function() {
ok(!scrollbox.hasAttribute("notoverflowing"),
"Tab strip should be overflowing");
let upButton = tabstrip._scrollButtonUp;
let downButton = tabstrip._scrollButtonDown;
let upButton = arrowScrollbox._scrollButtonUp;
let downButton = arrowScrollbox._scrollButtonDown;
let element;
gBrowser.selectedTab = firstScrollable();

8
browser/components/sessionstore/SessionStore.jsm
Просмотреть файл

@ -3350,9 +3350,9 @@ var SessionStoreInternal = {
var tabs = [];
// disable smooth scrolling while adding, moving, removing and selecting tabs
let tabstrip = tabbrowser.tabContainer.mTabstrip;
let smoothScroll = tabstrip.smoothScroll;
tabstrip.smoothScroll = false;
let arrowScrollbox = tabbrowser.tabContainer.arrowScrollbox;
let smoothScroll = arrowScrollbox.smoothScroll;
arrowScrollbox.smoothScroll = false;
// We need to keep track of the initially open tabs so that they
// can be moved to the end of the restored tabs.
@ -3494,7 +3494,7 @@ var SessionStoreInternal = {
}
// set smoothScroll back to the original value
tabstrip.smoothScroll = smoothScroll;
arrowScrollbox.smoothScroll = smoothScroll;
TelemetryStopwatch.finish("FX_SESSION_RESTORE_RESTORE_WINDOW_MS");
if (Services.prefs.getIntPref("browser.tabs.restorebutton") != 0 ) {