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

Bug 1270808 - Add deprecation warning within nsFaviconService.cpp. r=gijs

Browse Source
This commit is contained in:
Christoph Kerschbaumer 2016-05-06 13:56:24 +02:00
parent 9a18802e82
commit 46fe165877
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
toolkit/components/places/nsFaviconService.cpp
View File

@ -230,11 +230,21 @@ nsFaviconService::SetAndFetchFaviconForPage(nsIURI* aPageURI,
return NS_OK;
}
// Bug 1227289 : Let's default to the systemPrincipal if no loadingPrincipal is provided
// so addons not providing a loadingPrincipal do not break in release builds.
nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingPrincipal;
MOZ_ASSERT(loadingPrincipal, "please provide aLoadingPrincipal for this favicon");
if (!loadingPrincipal) {
// Bug 1227289 : Let's default to the systemPrincipal if no loadingPrincipal is provided
// so addons not providing a loadingPrincipal do not break in release builds.
const char16_t* params[] = {
MOZ_UTF16("nsFaviconService::setAndFetchFaviconForPage()"),
MOZ_UTF16("nsFaviconService::setAndFetchFaviconForPage(..., [optional aLoadingPrincipal])")
};
nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
NS_LITERAL_CSTRING("Security by Default"),
nullptr, // aDocument
nsContentUtils::eNECKO_PROPERTIES,
"APIDeprecationWarning",
params, ArrayLength(params));
loadingPrincipal = nsContentUtils::GetSystemPrincipal();
}
NS_ENSURE_TRUE(loadingPrincipal, NS_ERROR_FAILURE);
@ -382,11 +392,22 @@ nsFaviconService::ReplaceFaviconDataFromDataURL(nsIURI* aFaviconURI,
rv = ioService->GetProtocolHandler("data", getter_AddRefs(protocolHandler));
NS_ENSURE_SUCCESS(rv, rv);
// Bug 1227289 : Let's default to the systemPrincipal if no loadingPrincipal is provided
// so addons not providing a loadingPrincipal do not break in release builds.
nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingPrincipal;
MOZ_ASSERT(loadingPrincipal, "please provide aLoadingPrincipal for this favicon");
if (!loadingPrincipal) {
// Bug 1227289 : Let's default to the systemPrincipal if no loadingPrincipal is provided
// so addons not providing a loadingPrincipal do not break in release builds.
const char16_t* params[] = {
MOZ_UTF16("nsFaviconService::ReplaceFaviconDataFromDataURL()"),
MOZ_UTF16("nsFaviconService::ReplaceFaviconDataFromDataURL(..., [optional aLoadingPrincipal])")
};
nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
NS_LITERAL_CSTRING("Security by Default"),
nullptr, // aDocument
nsContentUtils::eNECKO_PROPERTIES,
"APIDeprecationWarning",
params, ArrayLength(params));
loadingPrincipal = nsContentUtils::GetSystemPrincipal();
}
NS_ENSURE_TRUE(loadingPrincipal, NS_ERROR_FAILURE);