8000 Backed out 2 changesets (bug 1721627) for Talos failures. CLOSED TREE · jamienicol/gecko@0541a62 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0541a62

Browse files
dglucadgluca
committed
Backed out 2 changesets (bug 1721627) for Talos failures. CLOSED TREE
Backed out changeset bc5e08d27347 (bug 1721627) Backed out changeset a670f5679e0b (bug 1721627)
1 parent 6f27765 commit 0541a62

File tree

5 files changed

+1
-96
lines changed

5 files changed

+1
-96
lines changed

‎browser/base/content/test/static/browser_all_files_referenced.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,6 @@ function chromeFileExists(aURI) {
725725
let channel = NetUtil.newChannel({
726726
uri: aURI,
727727
loadUsingSystemPrincipal: true,
728-
contentPolicyType: Ci.nsIContentPolicy.TYPE_FETCH,
729728
});
730729
let stream = channel.open();
731730
let sstream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(

‎modules/libjar/nsJARChannel.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,7 @@ nsresult nsJARChannel::CreateJarInput(nsIZipReaderCache* jarCache,
278278
RefPtr<nsJARInputThunk> input =
279279
new nsJARInputThunk(reader, mJarURI, mJarEntry, jarCache != nullptr);
280280
rv = input->Init();
281-
if (NS_FAILED(rv)) {
282-
if (rv == NS_ERROR_FILE_NOT_FOUND ||
283-
rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
284-
CheckForBrokenChromeURL(mLoadInfo, mOriginalURI);
285-
}
286-
return rv;
287-
}
281+
if (NS_FAILED(rv)) return rv;
288282

289283
// Make GetContentLength meaningful
290284
mContentLength = input->GetContentLength();

‎netwerk/base/nsNetUtil.cpp‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
#include "mozilla/net/PageThumbProtocolHandler.h"
102102
#include "mozilla/net/SFVService.h"
103103
#include <limits>
104-
#include "nsIXPConnect.h"
105104

106105
#if defined(MOZ_THUNDERBIRD) || defined(MOZ_SUITE)
107106
# include "nsNewMailnewsURI.h"
@@ -3306,84 +3305,3 @@ nsresult NS_HasRootDomain(const nsACString& aInput, const nsACString& aHost,
33063305
(aInput[index - 1] == '.' || aInput[index - 1] == '/');
33073306
return NS_OK;
33083307
}
3309-
3310-
void CheckForBrokenChromeURL(nsILoadInfo* aLoadInfo, nsIURI* aURI) {
3311-
if (!aURI) {
3312-
return;
3313-
}
3314-
nsAutoCString scheme;
3315-
aURI->GetScheme(scheme);
3316-
if (!scheme.EqualsLiteral("chrome") && !scheme.EqualsLiteral("resource")) {
3317-
return;
3318-
}
3319-
nsAutoCString host;
3320-
aURI->GetHost(host);
3321-
// Ignore test hits.
3322-
if (host.EqualsLiteral("mochitests") || host.EqualsLiteral("reftest")) {
3323-
return;
3324-
}
3325-
3326-
nsAutoCString filePath;
3327-
aURI->GetFilePath(filePath);
3328-
// Fluent likes checking for files everywhere and expects failure.
3329-
if (StringEndsWith(filePath, ".ftl"_ns)) {
3330-
return;
3331-
}
3332-
3333-
// Ignore fetches/xhrs, as they are frequently used in a way where
3334-
// non-existence is OK (ie with fallbacks). This risks false negatives (ie
3335-
// files that *should* be there but aren't) - which we accept for now.
3336-
ExtContentPolicy policy = aLoadInfo
3337-
? aLoadInfo->GetExternalContentPolicyType()
3338-
: ExtContentPolicy::TYPE_OTHER;
3339-
if (policy == ExtContentPolicy::TYPE_FETCH ||
3340-
policy == ExtContentPolicy::TYPE_XMLHTTPREQUEST) {
3341-
return;
3342-
}
3343-
3344-
#ifdef ANDROID
3345-
// See bug 1721910
3346-
if (StringEndsWith(filePath, "/tooltip.css"_ns)) {
3347-
return;
3348-
}
3349-
// See bug 1722078
3350-
if (StringEndsWith(filePath, "/app-extension-fields.properties"_ns)) {
3351-
return;
3352-
}
3353-
// See bug 1722485
3354-
if (StringEndsWith(filePath, "/SessionStore.jsm"_ns)) {
3355-
return;
3356-
}
3357-
3358-
// See bug 1722082
3359-
if (StringEndsWith(filePath, "/AttributionCode.jsm"_ns)) {
3360-
return;
3361-
}
3362-
#endif
3363-
3364-
nsCString spec;
3365-
aURI->GetSpec(spec);
3366-
3367-
// DTD files from gre may not exist when requested by tests.
3368-
if (StringBeginsWith(spec, "resource://gre/res/dtd/"_ns)) {
3369-
return;
3370-
}
3371-
3372-
// Bug 1723525
3373-
if (spec.EqualsLiteral("chrome://browser/content/preferences/dialogs/"
3374-
"siteDataSettings.css")) {
3375-
return;
3376-
}
3377-
3378-
if (xpc::IsInAutomation()) {
3379-
#ifdef DEBUG
3380-
if (NS_IsMainThread()) {
3381-
nsCOMPtr<nsIXPConnect> xpc = nsIXPConnect::XPConnect();
3382-
Unused << xpc->DebugDumpJSStack(false, false, false);
3383-
}
3384-
#endif
3385-
MOZ_CRASH_UNSAFE_PRINTF("Missing chrome or resource URLs: %s", spec.get());
3386-
} else {
3387-
printf_stderr("Missing chrome or resource URL: %s\n", spec.get());
3388-
}
3389-
}

‎netwerk/base/nsNetUtil.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,4 @@ bool SchemeIsFTP(nsIURI* aURI);
988988
nsresult NS_HasRootDomain(const nsACString& aInput, const nsACString& aHost,
989989
bool* aResult);
990990

991-
void CheckForBrokenChromeURL(nsILoadInfo* aLoadInfo, nsIURI* aURI);
992-
993991
#endif // !nsNetUtil_h__

‎netwerk/protocol/file/nsFileChannel.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ nsresult nsFileChannel::MakeFileInputStream(nsIFile* file,
295295
// canonicalize error message
296296
if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) rv = NS_ERROR_FILE_NOT_FOUND;
297297

298-
if (rv == NS_ERROR_FILE_NOT_FOUND) {
299-
CheckForBrokenChromeURL(mLoadInfo, OriginalURI());
300-
}
301-
302298
if (async && (NS_ERROR_FILE_NOT_FOUND == rv)) {
303299
// We don't return "Not Found" errors here. Since we could not find
304300
// the file, it's not a directory anyway.

0 commit comments

Comments
 (0)
0