зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1429580 - Remove now-unnecessary inherited_status argument. r=dbaron
Because of the previous patch, the inherited_status is now always EXPECTED_PASS so we don't need to actually pass it around. MozReview-Commit-ID: pgMkLgNCOE --HG-- extra : rebase_source : fce3c66ad7ccaf458befc7c41c9a2a4cdea87875
This commit is contained in:
Родитель
01ae4bfffa
Коммит
d4774c8857
|
@ -31,16 +31,16 @@ function ReadTopManifest(aFileURL, aFilter)
|
|||
throw "Expected a file or http URL for the manifest.";
|
||||
|
||||
g.manifestsLoaded = {};
|
||||
ReadManifest(url, EXPECTED_PASS, aFilter);
|
||||
ReadManifest(url, aFilter);
|
||||
}
|
||||
|
||||
// Note: If you materially change the reftest manifest parsing,
|
||||
// please keep the parser in print-manifest-dirs.py in sync.
|
||||
function ReadManifest(aURL, inherited_status, aFilter)
|
||||
function ReadManifest(aURL, aFilter)
|
||||
{
|
||||
// Ensure each manifest is only read once. This assumes that manifests that are
|
||||
// included with an unusual inherited_status or filters will be read via their
|
||||
// include before they are read directly in the case of a duplicate
|
||||
// Ensure each manifest is only read once. This assumes that manifests that
|
||||
// are included with filters will be read via their include before they are
|
||||
// read directly in the case of a duplicate
|
||||
if (g.manifestsLoaded.hasOwnProperty(aURL.spec)) {
|
||||
if (g.manifestsLoaded[aURL.spec] === null)
|
||||
return;
|
||||
|
@ -237,8 +237,6 @@ function ReadManifest(aURL, inherited_status, aFilter)
|
|||
}
|
||||
}
|
||||
|
||||
expected_status = Math.max(expected_status, inherited_status);
|
||||
|
||||
if (minAsserts > maxAsserts) {
|
||||
throw "Bad range in manifest file " + aURL.spec + " line " + lineNo;
|
||||
}
|
||||
|
@ -296,7 +294,7 @@ function ReadManifest(aURL, inherited_status, aFilter)
|
|||
var incURI = g.ioService.newURI(items[1], null, listURL);
|
||||
secMan.checkLoadURIWithPrincipal(principal, incURI,
|
||||
CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
|
||||
ReadManifest(incURI, expected_status, aFilter);
|
||||
ReadManifest(incURI, aFilter);
|
||||
}
|
||||
} else if (items[0] == TYPE_LOAD) {
|
||||
if (items.length != 2)
|
||||
|
|
Загрузка…
Ссылка в новой задаче