wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset a76600c2820b (bug 1240651) for ES test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-01-20 15:03:51 +01:00
parent 3fc242c703
commit f21597f788
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
caps/BasePrincipal.cpp
View File

@ -7,9 +7,6 @@
#include "mozilla/BasePrincipal.h"
#include "nsDocShell.h"
#ifdef MOZ_CRASHREPORTER
#include "nsExceptionHandler.h"
#endif
#include "nsIAddonPolicyService.h"
#include "nsIContentSecurityPolicy.h"
#include "nsIObjectInputStream.h"
@ -124,15 +121,7 @@ OriginAttributes::CreateSuffix(nsACString& aStr) const
}
if (!mAddonId.IsEmpty()) {
// if invalid format of mAddonId is found, annotate this into crash report.
if (mAddonId.FindCharInSet(dom::quota::QuotaManager::kReplaceChars) != kNotFound) {
#ifdef MOZ_CRASHREPORTER
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Crash_AddonId"),
NS_ConvertUTF16toUTF8(mAddonId));
#endif
MOZ_CRASH("Invalid mAddonId.");
}
MOZ_RELEASE_ASSERT(mAddonId.FindCharInSet(dom::quota::QuotaManager::kReplaceChars) == kNotFound);
params->Set(NS_LITERAL_STRING("addonId"), mAddonId);
}

10
toolkit/components/extensions/ExtensionManagement.jsm
View File

@ -160,16 +160,6 @@ var Service = {
this.uuidMap.set(uuid, extension);
this.aps.setAddonLoadURICallback(extension.id, this.checkAddonMayLoad.bind(this, extension));
this.aps.setAddonLocalizeCallback(extension.id, extension.localize.bind(extension));
// Annotate extensions into crash report.
try {
let uuids = "";
for (let [uuid, extension] of this.uuidMap) {
uuids += "[" + uuid + ", " + extension.id + "],";
}
Services.appinfo.annotateCrashReport("Extensions", uuids);
} catch (e) { }
},
// Called when an extension is unloaded.