Skip to content

Commit 27cc52d

Browse files
committed
Bug 1864896: Autofix unused function arguments (browser/components/sessionstore). r=sessionstore-reviewers,dao
Differential Revision: https://phabricator.services.mozilla.com/D202953
1 parent ab6e24a commit 27cc52d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+82
-107
lines changed

browser/components/sessionstore/ContentRestore.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ ProgressListener.prototype = {
417417
this.webProgress.removeProgressListener(this);
418418
},
419419

420-
onStateChange(webProgress, request, stateFlags, status) {
420+
onStateChange(webProgress, request, stateFlags, _status) {
421421
let { STATE_IS_WINDOW, STATE_STOP, STATE_START } =
422422
Ci.nsIWebProgressListener;
423423
if (!webProgress.isTopLevel || !(stateFlags & STATE_IS_WINDOW)) {

browser/components/sessionstore/ContentSessionStore.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class SessionHistoryListener extends Handler {
195195
});
196196
}
197197

198-
handleEvent(event) {
198+
handleEvent() {
199199
this.collect();
200200
}
201201

@@ -226,7 +226,7 @@ class SessionHistoryListener extends Handler {
226226
/**
227227
* @see nsIWebProgressListener.onStateChange
228228
*/
229-
onStateChange(webProgress, request, stateFlags, status) {
229+
onStateChange(webProgress, request, stateFlags, _status) {
230230
// Ignore state changes for subframes because we're only interested in the
231231
// top-document starting or stopping its load.
232232
if (!webProgress.isTopLevel || webProgress.DOMWindow != this.mm.content) {

browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export var RecentlyClosedTabsAndWindowsMenuUtils = {
182182
* @param aEvent
183183
* The command event when the user clicks the restore all menu item
184184
*/
185-
onRestoreAllWindowsCommand(aEvent) {
185+
onRestoreAllWindowsCommand() {
186186
const count = lazy.SessionStore.getClosedWindowCount();
187187
for (let index = 0; index < count; index++) {
188188
lazy.SessionStore.undoCloseWindow(index);
@@ -265,7 +265,7 @@ function createEntry(
265265
element.removeAttribute("oncommand");
266266
element.addEventListener(
267267
"command",
268-
event => {
268+
() => {
269269
lazy.SessionStore.undoClosedTabFromClosedWindow(
270270
{ sourceClosedId },
271271
aClosedTab.closedId

browser/components/sessionstore/SessionSaver.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ var SessionSaverInternal = {
210210
/**
211211
* Observe idle/ active notifications.
212212
*/
213-
observe(subject, topic, data) {
213+
observe(subject, topic) {
214214
switch (topic) {
215215
case "idle":
216216
this._isIdle = true;

browser/components/sessionstore/SessionStartup.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export var SessionStartup = {
268268
/**
269269
* Handle notifications
270270
*/
271-
observe(subject, topic, data) {
271+
observe(subject, topic) {
272272
switch (topic) {
273273
case "sessionstore-windows-restored":
274274
Services.obs.removeObserver(this, "sessionstore-windows-restored");

browser/components/sessionstore/SessionStore.sys.mjs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ var SessionStoreInternal = {
17891789

17901790
break;
17911791
case "SessionStore:restoreHistoryComplete":
1792-
this._restoreHistoryComplete(browser, data);
1792+
this._restoreHistoryComplete(browser);
17931793
break;
17941794
case "SessionStore:restoreTabContentStarted":
17951795
this._restoreTabContentStarted(browser, data);
@@ -7039,7 +7039,7 @@ var SessionStoreInternal = {
70397039
} catch {} // May have already gotten rid of the browser's webProgress.
70407040
},
70417041

7042-
onStateChange(webProgress, request, stateFlags, status) {
7042+
onStateChange(webProgress, request, stateFlags) {
70437043
if (
70447044
webProgress.isTopLevel &&
70457045
stateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW &&
@@ -7100,7 +7100,7 @@ var SessionStoreInternal = {
71007100
OnHistoryPurge() {},
71017101
OnHistoryReplaceEntry() {},
71027102

7103-
onStateChange(webProgress, request, stateFlags, status) {
7103+
onStateChange(webProgress, request, stateFlags) {
71047104
if (
71057105
webProgress.isTopLevel &&
71067106
stateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW &&
@@ -7181,7 +7181,7 @@ var SessionStoreInternal = {
71817181

71827182
this._tabStateRestorePromises.delete(browser.permanentKey);
71837183

7184-
this._restoreHistoryComplete(browser, data);
7184+
this._restoreHistoryComplete(browser);
71857185
};
71867186

71877187
promise.then(onResolve).catch(() => {});
@@ -7267,7 +7267,7 @@ var SessionStoreInternal = {
72677267
}
72687268
},
72697269

7270-
_restoreHistoryComplete(browser, data) {
7270+
_restoreHistoryComplete(browser) {
72717271
let win = browser.ownerGlobal;
72727272
let tab = win?.gBrowser.getTabForBrowser(browser);
72737273
if (!tab) {
@@ -7680,7 +7680,7 @@ var DirtyWindows = {
76807680
this._data.delete(window);
76817681
},
76827682

7683-
clear(window) {
7683+
clear(_window) {
76847684
this._data = new WeakMap();
76857685
},
76867686
};

browser/components/sessionstore/StartupPerformance.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export var StartupPerformance = {
153153
}, COLLECT_RESULTS_AFTER_MS);
154154
},
155155

156-
observe(subject, topic, details) {
156+
observe(subject, topic) {
157157
try {
158158
switch (topic) {
159159
case "sessionstore-restoring-on-startup":

browser/components/sessionstore/content/aboutSessionRestore.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -325,31 +325,31 @@ var treeView = {
325325
setTree(treeBox) {
326326
this.treeBox = treeBox;
327327
},
328-
getCellText(idx, column) {
328+
getCellText(idx) {
329329
return gTreeData[idx].label;
330330
},
331331
isContainer(idx) {
332332
return "open" in gTreeData[idx];
333333
},
334-
getCellValue(idx, column) {
334+
getCellValue(idx) {
335335
return gTreeData[idx].checked;
336336
},
337337
isContainerOpen(idx) {
338338
return gTreeData[idx].open;
339339
},
340-
isContainerEmpty(idx) {
340+
isContainerEmpty() {
341341
return false;
342342
},
343-
isSeparator(idx) {
343+
isSeparator() {
344344
return false;
345345
},
346346
isSorted() {
347347
return false;
348348
},
349-
isEditable(idx, column) {
349+
isEditable() {
350350
return false;
351351
},
352-
canDrop(idx, orientation, dt) {
352+
canDrop() {
353353
return false;
354354
},
355355
getLevel(idx) {
@@ -438,10 +438,10 @@ var treeView = {
438438
return null;
439439
},
440440

441-
cycleHeader(column) {},
442-
cycleCell(idx, column) {},
441+
cycleHeader() {},
442+
cycleCell() {},
443443
selectionChanged() {},
444-
getColumnProperties(column) {
444+
getColumnProperties() {
445445
return "";
446446
},
447447
};

browser/components/sessionstore/test/SessionStoreTestUtils.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export var SessionStoreTestUtils = {
100100
expectedTabsRestored = aState.windows.length;
101101
}
102102

103-
function onSSTabRestored(aEvent) {
103+
function onSSTabRestored() {
104104
if (++tabsRestored == expectedTabsRestored) {
105105
// Remove the event listener from each window
106106
windows.forEach(function (win) {
@@ -118,7 +118,7 @@ export var SessionStoreTestUtils = {
118118

119119
// Used to add our listener to further windows so we can catch SSTabRestored
120120
// coming from them when creating a multi-window state.
121-
function windowObserver(aSubject, aTopic, aData) {
121+
function windowObserver(aSubject, aTopic) {
122122
if (aTopic == "domwindowopened") {
123123
let newWindow = aSubject;
124124
newWindow.addEventListener(

browser/components/sessionstore/test/browser_354894_perwindowpb.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ let setupTest = async function (options, testFunction) {
133133
* Helper: Will observe and handle the notifications for us
134134
*/
135135
let hitCount = 0;
136-
function observer(aCancel, aTopic, aData) {
136+
function observer(aCancel, aTopic) {
137137
// count so that we later may compare
138138
observing[aTopic]++;
139139

@@ -415,7 +415,7 @@ add_task(async function test_open_close_restore_from_popup() {
415415
return;
416416
}
417417

418-
await setupTest({}, async function (newWin, obs) {
418+
await setupTest({}, async function (newWin) {
419419
let newWin2 = await promiseNewWindowLoaded();
420420
await injectTestTabs(newWin2);
421421

browser/components/sessionstore/test/browser_394759_basic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function test() {
7474
let expectedTabs = data[0].tabs.length;
7575
newWin2.addEventListener(
7676
"SSTabRestored",
77-
function sstabrestoredListener(aEvent) {
77+
function sstabrestoredListener() {
7878
++restoredTabs;
7979
info("Restored tab " + restoredTabs + "/" + expectedTabs);
8080
if (restoredTabs < expectedTabs) {

browser/components/sessionstore/test/browser_394759_behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function testWindows(windowsToOpen, expectedResults) {
3434
}
3535

3636
let closedWindowData = ss.getClosedWindowData();
37-
let numPopups = closedWindowData.filter(function (el, i, arr) {
37+
let numPopups = closedWindowData.filter(function (el) {
3838
return el.isPopup;
3939
}).length;
4040
let numNormal = ss.getClosedWindowCount() - numPopups;

browser/components/sessionstore/test/browser_394759_purge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let { ForgetAboutSite } = ChromeUtils.importESModule(
99
function promiseClearHistory() {
1010
return new Promise(resolve => {
1111
let observer = {
12-
observe(aSubject, aTopic, aData) {
12+
observe() {
1313
Services.obs.removeObserver(
1414
this,
1515
"browser:purge-session-history-for-domain"

browser/components/sessionstore/test/browser_459906.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function test() {
1717
let tab = BrowserTestUtils.addTab(gBrowser, testURL);
1818
tab.linkedBrowser.addEventListener(
1919
"load",
20-
function listener(aEvent) {
20+
function listener() {
2121
// wait for all frames to load completely
2222
if (frameCount++ < 2) {
2323
return;
@@ -31,7 +31,7 @@ function test() {
3131
let tab2 = gBrowser.duplicateTab(tab);
3232
tab2.linkedBrowser.addEventListener(
3333
"load",
34-
function loadListener(eventTab2) {
34+
function loadListener() {
3535
// wait for all frames to load (and reload!) completely
3636
if (frameCount++ < 2) {
3737
return;

browser/components/sessionstore/test/browser_461743.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function test() {
2424
let tab2 = gBrowser.duplicateTab(tab);
2525
tab2.linkedBrowser.addEventListener(
2626
"461743",
27-
function listener(eventTab2) {
27+
function listener() {
2828
tab2.linkedBrowser.removeEventListener("461743", listener, true);
2929
is(aEvent.data, "done", "XSS injection was attempted");
3030

browser/components/sessionstore/test/browser_464199.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let { ForgetAboutSite } = ChromeUtils.importESModule(
99
function promiseClearHistory() {
1010
return new Promise(resolve => {
1111
let observer = {
12-
observe(aSubject, aTopic, aData) {
12+
observe() {
1313
Services.obs.removeObserver(
1414
this,
1515
"browser:purge-session-history-for-domain"

browser/components/sessionstore/test/browser_464620_a.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function test() {
2727
let tab2 = gBrowser.duplicateTab(tab);
2828
tab2.linkedBrowser.addEventListener(
2929
"464620_a",
30-
function listener(eventTab2) {
30+
function listener() {
3131
tab2.linkedBrowser.removeEventListener("464620_a", listener, true);
3232
is(aEvent.data, "done", "XSS injection was attempted");
3333

browser/components/sessionstore/test/browser_464620_b.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function test() {
2727
let tab2 = gBrowser.duplicateTab(tab);
2828
tab2.linkedBrowser.addEventListener(
2929
"464620_b",
30-
function listener(eventTab2) {
30+
function listener() {
3131
tab2.linkedBrowser.removeEventListener("464620_b", listener, true);
3232
is(aEvent.data, "done", "XSS injection was attempted");
3333

browser/components/sessionstore/test/browser_526613.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function test() {
4545
};
4646

4747
let pass = 1;
48-
function observer(aSubject, aTopic, aData) {
48+
function observer(aSubject, aTopic) {
4949
is(
5050
aTopic,
5151
"sessionstore-browser-state-restored",

browser/components/sessionstore/test/browser_580512.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function openWinWithCb(cb, argURIs, expectedURIs) {
8888
var expectedLoads = expectedURIs.length;
8989

9090
win.gBrowser.addTabsProgressListener({
91-
onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
91+
onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, _aStatus) {
9292
if (
9393
aRequest &&
9494
aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&

browser/components/sessionstore/test/browser_586068-apptabs.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,7 @@ add_task(async function test() {
6969

7070
let loadCount = 0;
7171
let promiseRestoringTabs = new Promise(resolve => {
72-
gProgressListener.setCallback(function (
73-
aBrowser,
74-
aNeedRestore,
75-
aRestoring,
76-
aRestored
77-
) {
72+
gProgressListener.setCallback(function (aBrowser) {
7873
loadCount++;
7974

8075
// We'll make sure that the loads we get come from pinned tabs or the

browser/components/sessionstore/test/browser_586068-browser_state_interrupted.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,7 @@ add_task(async function test() {
147147

148148
let loadCount = 0;
149149
let promiseRestoringTabs = new Promise(resolve => {
150-
gProgressListener.setCallback(function (
151-
aBrowser,
152-
aNeedRestore,
153-
aRestoring,
154-
aRestored
155-
) {
150+
gProgressListener.setCallback(function (aBrowser, aNeedRestore) {
156151
loadCount++;
157152

158153
if (
@@ -188,7 +183,7 @@ add_task(async function test() {
188183
});
189184

190185
// We also want to catch the extra windows (there should be 2), so we need to observe domwindowopened
191-
Services.ww.registerNotification(function observer(aSubject, aTopic, aData) {
186+
Services.ww.registerNotification(function observer(aSubject, aTopic) {
192187
if (aTopic == "domwindowopened") {
193188
let win = aSubject;
194189
win.addEventListener(

browser/components/sessionstore/test/browser_586068-multi_window.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,7 @@ add_task(async function test() {
7272

7373
let loadCount = 0;
7474
let promiseRestoringTabs = new Promise(resolve => {
75-
gProgressListener.setCallback(function (
76-
aBrowser,
77-
aNeedRestore,
78-
aRestoring,
79-
aRestored
80-
) {
75+
gProgressListener.setCallback(function (aBrowser, aNeedRestore) {
8176
if (++loadCount == numTabs) {
8277
// We don't actually care about load order in this test, just that they all
8378
// do load.
@@ -91,7 +86,7 @@ add_task(async function test() {
9186
});
9287

9388
// We also want to catch the 2nd window, so we need to observe domwindowopened
94-
Services.ww.registerNotification(function observer(aSubject, aTopic, aData) {
89+
Services.ww.registerNotification(function observer(aSubject, aTopic) {
9590
if (aTopic == "domwindowopened") {
9691
let win = aSubject;
9792
win.addEventListener(

browser/components/sessionstore/test/browser_586068-window_state.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,7 @@ add_task(async function test() {
8282

8383
let loadCount = 0;
8484
let promiseRestoringTabs = new Promise(resolve => {
85-
gProgressListener.setCallback(function (
86-
aBrowser,
87-
aNeedRestore,
88-
aRestoring,
89-
aRestored
90-
) {
85+
gProgressListener.setCallback(function (aBrowser, aNeedRestore) {
9186
// When loadCount == 2, we'll also restore state2 into the window
9287
if (++loadCount == 2) {
9388
ss.setWindowState(window, JSON.stringify(state2), false);

0 commit comments

Comments
 (0)