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

Backed out changeset d283c59402ce (bug 1277803)

Browse Source 
CLOSED TREE
This commit is contained in:
Iris Hsiao 2016-10-07 11:24:08 +08:00
parent dd43a4748d
commit e6ab0adc40
13 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/contextualidentity/test/browser/browser_favicon.js
View File

@ -22,7 +22,7 @@ function getIconFile() {
NetUtil.asyncFetch({
uri: "http://www.example.com/browser/browser/components/contextualidentity/test/browser/favicon-normal32.png",
loadUsingSystemPrincipal: true,
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE_FAVICON
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
}, function(inputStream, status) {
let size = inputStream.available();
gFaviconData = NetUtil.readInputStreamToString(inputStream, size);

1
dom/base/nsContentPolicyUtils.h
View File

@ -131,7 +131,6 @@ NS_CP_ContentTypeName(uint32_t contentType)
CASE_RETURN( TYPE_INTERNAL_SCRIPT_PRELOAD );
CASE_RETURN( TYPE_INTERNAL_IMAGE );
CASE_RETURN( TYPE_INTERNAL_IMAGE_PRELOAD );
CASE_RETURN( TYPE_INTERNAL_IMAGE_FAVICON );
CASE_RETURN( TYPE_INTERNAL_STYLESHEET );
CASE_RETURN( TYPE_INTERNAL_STYLESHEET_PRELOAD );
default:

1
dom/base/nsContentUtils.cpp
View File

@ -8417,7 +8417,6 @@ nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType)
case nsIContentPolicy::TYPE_INTERNAL_IMAGE:
case nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD:
case nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON:
return nsIContentPolicy::TYPE_IMAGE;
case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET:

8
dom/base/nsIContentPolicyBase.idl
View File

@ -321,14 +321,6 @@ interface nsIContentPolicyBase : nsISupports
*/
const nsContentPolicyType TYPE_INTERNAL_STYLESHEET_PRELOAD = 40;
/**
* Indicates an internal constant for favicon.
*
* This will be mapped to TYPE_IMAGE before being passed
* to content policy implementations.
*/
const nsContentPolicyType TYPE_INTERNAL_IMAGE_FAVICON = 41;
/* When adding new content types, please update nsContentBlocker,
* NS_CP_ContentTypeName, nsCSPContext, all nsIContentPolicy
* implementations, the static_assert in dom/cache/DBSchema.cpp,

3
dom/cache/DBSchema.cpp vendored
View File

@ -292,8 +292,7 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 &&
nsIContentPolicy::TYPE_INTERNAL_IMAGE == 37 &&
nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD == 38 &&
nsIContentPolicy::TYPE_INTERNAL_STYLESHEET == 39 &&
nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD == 40 &&
nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON == 41,
nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD == 40,
"nsContentPolicyType values are as expected");
namespace {

1
dom/fetch/InternalRequest.cpp
View File

@ -181,7 +181,6 @@ InternalRequest::MapContentPolicyTypeToRequestContext(nsContentPolicyType aConte
break;
case nsIContentPolicy::TYPE_INTERNAL_IMAGE:
case nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD:
case nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON:
context = RequestContext::Image;
break;
case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET:

2
dom/fetch/InternalRequest.h
View File

@ -45,7 +45,7 @@ namespace dom {
* frame | TYPE_INTERNAL_FRAME
* hyperlink |
* iframe | TYPE_INTERNAL_IFRAME
* image | TYPE_INTERNAL_IMAGE, TYPE_INTERNAL_IMAGE_PRELOAD, TYPE_INTERNAL_IMAGE_FAVICON
* image | TYPE_INTERNAL_IMAGE, TYPE_INTERNAL_IMAGE_PRELOAD
* imageset | TYPE_IMAGESET
* import | Not supported by Gecko
* internal | TYPE_DOCUMENT, TYPE_XBL, TYPE_OTHER

1
dom/security/nsContentSecurityManager.cpp
View File

@ -51,7 +51,6 @@ static bool IsImageLoadInEditorAppType(nsILoadInfo* aLoadInfo)
nsContentPolicyType type = aLoadInfo->InternalContentPolicyType();
if (type != nsIContentPolicy::TYPE_INTERNAL_IMAGE &&
type != nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD &&
type != nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON &&
type != nsIContentPolicy::TYPE_IMAGESET) {
return false;
}

2
toolkit/components/places/FaviconHelpers.cpp
View File

@ -422,7 +422,7 @@ AsyncFetchAndSetIconForPage::FetchFromNetwork() {
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS |
nsILoadInfo::SEC_ALLOW_CHROME |
nsILoadInfo::SEC_DISALLOW_SCRIPT,
nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON);
nsIContentPolicy::TYPE_INTERNAL_IMAGE);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIInterfaceRequestor> listenerRequestor =

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

@ -413,7 +413,7 @@ nsFaviconService::ReplaceFaviconDataFromDataURL(nsIURI* aFaviconURI,
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS |
nsILoadInfo::SEC_ALLOW_CHROME |
nsILoadInfo::SEC_DISALLOW_SCRIPT,
nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON);
nsIContentPolicy::TYPE_INTERNAL_IMAGE);
nsCOMPtr<nsIChannel> channel;
rv = protocolHandler->NewChannel2(dataURI, loadInfo, getter_AddRefs(channel));

2
toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage.js
View File

@ -33,7 +33,7 @@ function test() {
NetUtil.asyncFetch({
uri: favIconLocation,
loadUsingSystemPrincipal: true,
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE_FAVICON
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
}, function(inputStream, status) {
if (!Components.isSuccessCode(status)) {
ok(false, "Could not get the icon file");

6
toolkit/components/places/tests/favicons/test_moz-anno_favicon_mime_type.js
View File

@ -62,7 +62,7 @@ function run_test()
let channel = NetUtil.newChannel({
uri: fs.defaultFavicon,
loadUsingSystemPrincipal: true,
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE_FAVICON
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
});
channel.asyncOpen2(new streamListener("image/png"));
do_test_pending();
@ -72,7 +72,7 @@ function run_test()
channel = NetUtil.newChannel({
uri: moz_anno_favicon_prefix + "http://mozilla.org",
loadUsingSystemPrincipal: true,
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE_FAVICON
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
});
channel.asyncOpen2(new streamListener("image/png"));
do_test_pending();
@ -88,7 +88,7 @@ function run_test()
channel = NetUtil.newChannel({
uri: moz_anno_favicon_prefix + testURI.spec,
loadUsingSystemPrincipal: true,
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE_FAVICON
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
});
channel.asyncOpen2(new streamListener("image/png"));
do_test_pending();

2
toolkit/components/places/tests/favicons/test_page-icon_protocol.js
View File

@ -7,7 +7,7 @@ function fetchIconForSpec(spec) {
NetUtil.asyncFetch({
uri: NetUtil.newURI("page-icon:" + TEST_URI.spec),
loadUsingSystemPrincipal: true,
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE_FAVICON
contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
}, (input, status, request) => {
if (!Components.isSuccessCode(status)) {
reject(new Error("unable to load icon"));