Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1290701 - Replace in-tree consumer of non-standard Iterator() with Object.{values,entries} in toolkit/. r=dtownsend

Browse Source
This commit is contained in:
Kashyap Gajera 2016-08-03 11:53:10 +05:30
parent 3a8014af9d
commit a2fde92e87
23 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/passwordmgr/LoginHelper.jsm
View File

@ -147,7 +147,7 @@ this.LoginHelper = {
let propertyBag = Cc["@mozilla.org/hash-property-bag;1"]
.createInstance(Ci.nsIWritablePropertyBag);
if (aProperties) {
for (let [name, value] of Iterator(aProperties)) {
for (let [name, value] of Object.entries(aProperties)) {
propertyBag.setProperty(name, value);
}
}

4
toolkit/components/passwordmgr/test/LoginTestUtils.jsm
View File

@ -111,7 +111,7 @@ this.LoginTestUtils.testData = {
"form_field_username", "form_field_password");
loginInfo.QueryInterface(Ci.nsILoginMetaInfo);
if (modifications) {
for (let [name, value] of Iterator(modifications)) {
for (let [name, value] of Object.entries(modifications)) {
loginInfo[name] = value;
}
}
@ -131,7 +131,7 @@ this.LoginTestUtils.testData = {
"the password", "", "");
loginInfo.QueryInterface(Ci.nsILoginMetaInfo);
if (modifications) {
for (let [name, value] of Iterator(modifications)) {
for (let [name, value] of Object.entries(modifications)) {
loginInfo[name] = value;
}
}

2
toolkit/components/places/PlacesRemoteTabsAutocompleteProvider.jsm
View File

@ -49,7 +49,7 @@ function buildItems() {
if (weaveXPCService.ready) {
let engine = Weave.Service.engineManager.get("tabs");
for (let [guid, client] in Iterator(engine.getAllClients())) {
for (let [guid, client] of Object.entries(engine.getAllClients())) {
clients.set(guid, client);
for (let tab of client.tabs) {
let url = tab.urlHistory[0];

2
toolkit/components/places/tests/autocomplete/head_autocomplete.js
View File

@ -268,7 +268,7 @@ function run_test() {
Task.spawn(function* () {
// Iterate over all tasks and execute them
for (let [, [fn, args]] in Iterator(gNextTestSetupTasks)) {
for (let [fn, args] of gNextTestSetupTasks) {
yield fn.apply(this, args);
}

4
toolkit/components/places/tests/queries/test_async.js
View File

@ -342,7 +342,7 @@ var DataHelper = {
*/
_makeDataWithDefaults: function DH__makeDataWithDefaults(aData, aDefaults) {
let dat = {};
for (let [prop, val] in Iterator(aDefaults)) {
for (let [prop, val] of Object.entries(aDefaults)) {
dat[prop] = aData.hasOwnProperty(prop) ? aData[prop] : val;
}
return dat;
@ -356,7 +356,7 @@ function run_test()
add_task(function* test_async()
{
for (let [, test] in Iterator(tests)) {
for (let test of tests) {
yield PlacesUtils.bookmarks.eraseEverything();
test.__proto__ = new Test();

2
toolkit/components/places/tests/queries/test_sorting.js
View File

@ -1271,7 +1271,7 @@ function run_test()
add_task(function* test_sorting()
{
for (let [, test] in Iterator(tests)) {
for (let test of tests) {
yield test.setup();
yield PlacesTestUtils.promiseAsyncUpdates();
test.check();

12
toolkit/components/places/tests/queries/test_tags.js
View File

@ -300,7 +300,7 @@ add_task(function* tagsAreNot_history() {
};
do_print("Add visits and tag the URIs");
for (let [pURI, tags] in Iterator(urisAndTags)) {
for (let [pURI, tags] of Object.entries(urisAndTags)) {
let nsiuri = uri(pURI);
yield PlacesTestUtils.addVisits(nsiuri);
if (tags)
@ -335,7 +335,7 @@ add_task(function* tagsAreNot_history() {
"http://example.com/3"]);
// Clean up.
for (let [pURI, tags] in Iterator(urisAndTags)) {
for (let [pURI, tags] of Object.entries(urisAndTags)) {
let nsiuri = uri(pURI);
if (tags)
PlacesUtils.tagging.untagURI(nsiuri, tags);
@ -352,7 +352,7 @@ add_task(function* tagsAreNot_bookmarks() {
};
do_print("Add bookmarks and tag the URIs");
for (let [pURI, tags] in Iterator(urisAndTags)) {
for (let [pURI, tags] of Object.entries(urisAndTags)) {
let nsiuri = uri(pURI);
yield addBookmark(nsiuri);
if (tags)
@ -392,7 +392,7 @@ add_task(function* tagsAreNot_bookmarks() {
"http://example.com/3"]);
// Clean up.
for (let [pURI, tags] in Iterator(urisAndTags)) {
for (let [pURI, tags] of Object.entries(urisAndTags)) {
let nsiuri = uri(pURI);
if (tags)
PlacesUtils.tagging.untagURI(nsiuri, tags);
@ -472,7 +472,7 @@ add_task(function* ORed_queries() {
}
do_print("Add visits and tag the URIs");
for (let [pURI, tags] in Iterator(urisAndTags)) {
for (let [pURI, tags] of Object.entries(urisAndTags)) {
let nsiuri = uri(pURI);
yield PlacesTestUtils.addVisits(nsiuri);
if (tags)
@ -519,7 +519,7 @@ add_task(function* ORed_queries() {
queryResultsAre(root, ["http://example.com/1", "http://example.com/2"]);
// Clean up.
for (let [pURI, tags] in Iterator(urisAndTags)) {
for (let [pURI, tags] of Object.entries(urisAndTags)) {
let nsiuri = uri(pURI);
if (tags)
PlacesUtils.tagging.untagURI(nsiuri, tags);

2
toolkit/components/places/tests/unit/test_000_frecency.js
View File

@ -70,7 +70,7 @@ function* task_initializeBucket(bucket) {
// generate a date within the cutoff period
var dateInPeriod = (now - ((cutoff - 1) * 86400 * 1000)) * 1000;
for (let [bonusName, visitType] in Iterator(bonusPrefs)) {
for (let [bonusName, visitType] of Object.entries(bonusPrefs)) {
var frecency = -1;
var calculatedURI = null;
var matchTitle = "";

2
toolkit/components/places/tests/unit/test_463863.js
View File

@ -48,7 +48,7 @@ function run_test()
add_task(function* test_execute()
{
// add visits, one for each transition type
for (let [, transition] in Iterator(transitions)) {
for (let transition of transitions) {
yield PlacesTestUtils.addVisits({
uri: uri("http://" + transition + ".mozilla.org/"),
transition: transition

2
toolkit/components/places/tests/unit/test_adaptive.js
View File

@ -384,7 +384,7 @@ add_task(function* test_adaptive()
// Disable autoFill for this test.
Services.prefs.setBoolPref("browser.urlbar.autoFill", false);
do_register_cleanup(() => Services.prefs.clearUserPref("browser.urlbar.autoFill"));
for (let [, test] in Iterator(tests)) {
for (let test of tests) {
// Cleanup.
PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.tagsFolderId);

2
toolkit/components/places/tests/unit/test_preventive_maintenance.js
View File

@ -1327,7 +1327,7 @@ add_task(function* test_preventive_maintenance()
stmt.finalize();
do_check_true(defaultBookmarksMaxId > 0);
for (let [, test] in Iterator(tests)) {
for (let test of tests) {
dump("\nExecuting test: " + test.name + "\n" + "*** " + test.desc + "\n");
yield test.setup();

14
toolkit/content/aboutTelemetry.js
View File

@ -881,7 +881,7 @@ var SlowSQL = {
* @param aSql SQL stats object
*/
renderTable: function SlowSQL_renderTable(aTable, aSql) {
for (let [sql, [hitCount, totalTime]] of Iterator(aSql)) {
for (let [sql, [hitCount, totalTime]] of Object.entries(aSql)) {
let averageTime = totalTime / hitCount;
let sqlRow = document.createElement("tr");
@ -1477,7 +1477,7 @@ var KeyValueTable = {
* @param aMeasurements Key/value map
*/
renderBody: function KeyValueTable_renderBody(aTable, aMeasurements) {
for (let [key, value] of Iterator(aMeasurements)) {
for (let [key, value] of Object.entries(aMeasurements)) {
// use .valueOf() to unbox Number, String, etc. objects
if (value &&
(typeof value == "object") &&
@ -1510,7 +1510,7 @@ var KeyedHistogram = {
divTitle.appendChild(document.createTextNode(id));
outerDiv.appendChild(divTitle);
for (let [name, hgram] of Iterator(keyedHistogram)) {
for (let [name, hgram] of Object.entries(keyedHistogram)) {
Histogram.render(outerDiv, name, hgram);
}
@ -1933,7 +1933,7 @@ function displayPingData(ping, updatePayloadList = false) {
setHasData("histograms-section", hasData);
if (hasData) {
for (let [name, hgram] of Iterator(histograms)) {
for (let [name, hgram] of Object.entries(histograms)) {
Histogram.render(hgramDiv, name, hgram, {unpacked: true});
}
@ -1954,7 +1954,7 @@ function displayPingData(ping, updatePayloadList = false) {
let keyedHistograms = payload.keyedHistograms;
if (keyedHistograms) {
let hasData = false;
for (let [id, keyed] of Iterator(keyedHistograms)) {
for (let [id, keyed] of Object.entries(keyedHistograms)) {
if (Object.keys(keyed).length > 0) {
hasData = true;
KeyedHistogram.render(keyedDiv, id, keyed, {unpacked: true});
@ -1970,8 +1970,8 @@ function displayPingData(ping, updatePayloadList = false) {
let addonHistogramsRendered = false;
let addonData = payload.addonHistograms;
if (addonData) {
for (let [addon, histograms] of Iterator(addonData)) {
for (let [name, hgram] of Iterator(histograms)) {
for (let [addon, histograms] of Object.entries(addonData)) {
for (let [name, hgram] of Object.entries(histograms)) {
addonHistogramsRendered = true;
Histogram.render(addonDiv, addon + ": " + name, hgram, {unpacked: true});
}

2
toolkit/content/tests/chrome/test_bug253481.xul
View File

@ -71,7 +71,7 @@ SimpleTest.waitForClipboard(testString, function() {
.getService(Components.interfaces.nsIClipboardHelper);
clip.copyString(testString);
}, function() {
for (let [item, expected] in Iterator(expectedResults)) {
for (let [item, expected] of Object.entries(expectedResults)) {
testPaste(item, $(item), expected);
}

2
toolkit/content/tests/unit/test_contentAreaUtils.js
View File

@ -62,7 +62,7 @@ function test_stringBundle() {
"SaveLinkTitle",
];
for (let [, filePickerTitleKey] in Iterator(validFilePickerTitleKeys)) {
for (let filePickerTitleKey of validFilePickerTitleKeys) {
// Just check that the string exists
try {
ContentAreaUtils.stringBundle.GetStringFromName(filePickerTitleKey);

2
toolkit/crashreporter/CrashSubmit.jsm
View File

@ -277,7 +277,7 @@ Submitter.prototype = {
let formData = Cc["@mozilla.org/files/formdata;1"]
.createInstance(Ci.nsIDOMFormData);
// add the data
for (let [name, value] in Iterator(this.extraKeyVals)) {
for (let [name, value] of Object.entries(this.extraKeyVals)) {
if (name != "ServerURL") {
formData.append(name, value);
}

2
toolkit/modules/Preferences.jsm
View File

@ -101,7 +101,7 @@ Preferences._get = function(prefName, defaultValue, valueType) {
*/
Preferences.set = function(prefName, prefValue) {
if (isObject(prefName)) {
for (let [name, value] in Iterator(prefName))
for (let [name, value] of Object.entries(prefName))
this.set(name, value);
return;
}

2
toolkit/modules/Sqlite.jsm
View File

@ -685,7 +685,7 @@ ConnectionData.prototype = Object.freeze({
let paramsArray = statement.newBindingParamsArray();
for (let p of params) {
let bindings = paramsArray.newBindingParams();
for (let [key, value] of Iterator(p)) {
for (let [key, value] of Object.entries(p)) {
bindings.bindByName(key, value);
}
paramsArray.addParams(bindings);

2
toolkit/modules/tests/xpcshell/test_session_recorder.js
View File

@ -241,7 +241,7 @@ add_task(function* test_multiple_sessions() {
let sessions = recorder.getPreviousSessions();
do_check_eq(Object.keys(sessions).length, 10);
for (let [i, session] in Iterator(sessions)) {
for (let [i, session] of Object.entries(sessions)) {
do_check_eq(session.activeTicks, i);
if (i > 0) {

6
toolkit/modules/tests/xpcshell/test_sqlite.js
View File

@ -43,7 +43,7 @@ function failTestsOnAutoClose(enabled) {
function getConnection(dbName, extraOptions={}) {
let path = dbName + ".sqlite";
let options = {path: path};
for (let [k, v] in Iterator(extraOptions)) {
for (let [k, v] of Object.entries(extraOptions)) {
options[k] = v;
}
@ -59,7 +59,7 @@ function* getDummyDatabase(name, extraOptions={}) {
let c = yield getConnection(name, extraOptions);
c._initialStatementCount = 0;
for (let [k, v] in Iterator(TABLES)) {
for (let [k, v] of Object.entries(TABLES)) {
yield c.execute("CREATE TABLE " + k + "(" + v + ")");
c._initialStatementCount++;
}
@ -76,7 +76,7 @@ function* getDummyTempDatabase(name, extraOptions={}) {
let c = yield getConnection(name, extraOptions);
c._initialStatementCount = 0;
for (let [k, v] in Iterator(TABLES)) {
for (let [k, v] of Object.entries(TABLES)) {
yield c.execute("CREATE TEMP TABLE " + k + "(" + v + ")");
c._initialStatementCount++;
}

4
toolkit/modules/tests/xpcshell/test_sqlite_shutdown.js
View File

@ -18,7 +18,7 @@ Cu.import("resource://gre/modules/Promise.jsm");
function getConnection(dbName, extraOptions={}) {
let path = dbName + ".sqlite";
let options = {path: path};
for (let [k, v] in Iterator(extraOptions)) {
for (let [k, v] of Object.entries(extraOptions)) {
options[k] = v;
}
@ -34,7 +34,7 @@ function* getDummyDatabase(name, extraOptions={}) {
let c = yield getConnection(name, extraOptions);
c._initialStatementCount = 0;
for (let [k, v] in Iterator(TABLES)) {
for (let [k, v] of Object.entries(TABLES)) {
yield c.execute("CREATE TABLE " + k + "(" + v + ")");
c._initialStatementCount++;
}

2
toolkit/mozapps/downloads/content/downloads.js
View File

@ -415,7 +415,7 @@ function Startup()
// convert strings to those in the string bundle
let sb = document.getElementById("downloadStrings");
let getStr = string => sb.getString(string);
for (let [name, value] in Iterator(gStr))
for (let [name, value] of Object.entries(gStr))
gStr[name] = typeof value == "string" ? getStr(value) : value.map(getStr);
initStatement();

4
toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_dialog_layout.xul
View File

@ -82,9 +82,9 @@ function loadNextTest() {
}
function checkWindow(win) {
for (let [id, props] in Iterator(tests[testIndex].elements)) {
for (let [id, props] of Object.entries(tests[testIndex].elements)) {
let elem = win.dialog.dialogElement(id);
for (let [prop, value] in Iterator(props)) {
for (let [prop, value] of Object.entries(props)) {
is(elem[prop], value,
"Element with id " + id + " has property " +
prop + " set to " + value);

2
toolkit/mozapps/downloads/tests/unit/test_syncedDownloadUtils.js
View File

@ -21,6 +21,6 @@ function run_test()
// Pretend we're a download status bar also asking for a time left, but we're
// using a different "last sec". We need to make sure we get the same time.
let lastSec = 314;
for (let [time, text] in Iterator(downloadTimes))
for (let [time, text] of Object.entries(downloadTimes))
do_check_eq(DownloadUtils.getTimeLeft(time, lastSec)[0], text);
}