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

Bug 1618536 - Introduce nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD representing preload of font, mapping to TYPE_FONT externally, r=baku

Browse Source 
Depends on D69628

Differential Revision: https://phabricator.services.mozilla.com/D72118
This commit is contained in:
Honza Bambas 2020-05-11 14:13:16 +00:00
parent 9e027ce534
commit ef0d4e6dd1
9 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/nsContentPolicyUtils.h
View File

@ -141,6 +141,7 @@ inline const char* NS_CP_ContentTypeName(uint32_t contentType) {
CASE_RETURN(TYPE_INTERNAL_FORCE_ALLOWED_DTD); CASE_RETURN(TYPE_INTERNAL_FORCE_ALLOWED_DTD);
CASE_RETURN(TYPE_INTERNAL_AUDIOWORKLET); CASE_RETURN(TYPE_INTERNAL_AUDIOWORKLET);
CASE_RETURN(TYPE_INTERNAL_PAINTWORKLET); CASE_RETURN(TYPE_INTERNAL_PAINTWORKLET);
CASE_RETURN(TYPE_INTERNAL_FONT_PRELOAD);
default: default:
return "<Unknown Type>"; return "<Unknown Type>";
} }

3
dom/base/nsContentUtils.cpp
View File

@ -7990,7 +7990,8 @@ bool nsContentUtils::IsPreloadType(nsContentPolicyType aType) {
return (aType == nsIContentPolicy::TYPE_INTERNAL_SCRIPT_PRELOAD || return (aType == nsIContentPolicy::TYPE_INTERNAL_SCRIPT_PRELOAD ||
aType == nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD || aType == nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD ||
aType == nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD || aType == nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD ||
aType == nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD); aType == nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD ||
aType == nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD);
} }
/* static */ /* static */

3
dom/base/nsContentUtils.h
View File

@ -3411,6 +3411,9 @@ nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType) {
case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD:
return nsIContentPolicy::TYPE_DTD; return nsIContentPolicy::TYPE_DTD;
case nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD:
return nsIContentPolicy::TYPE_FONT;
default: default:
return aType; return aType;
} }

6
dom/base/nsIContentPolicy.idl
View File

@ -394,6 +394,12 @@ interface nsIContentPolicy : nsISupports
*/ */
const nsContentPolicyType TYPE_INTERNAL_PAINTWORKLET = 50; const nsContentPolicyType TYPE_INTERNAL_PAINTWORKLET = 50;
/**
* Same as TYPE_FONT but indicates this is a <link rel=preload as=font>
* preload initiated load.
*/
const nsContentPolicyType TYPE_INTERNAL_FONT_PRELOAD = 51;
/* When adding new content types, please update /* When adding new content types, please update
* NS_CP_ContentTypeName, nsCSPContext, CSP_ContentTypeToDirective, * NS_CP_ContentTypeName, nsCSPContext, CSP_ContentTypeToDirective,
* DoContentSecurityChecks, all nsIContentPolicy implementations, the * DoContentSecurityChecks, all nsIContentPolicy implementations, the

3
dom/cache/DBSchema.cpp vendored
View File

@ -336,7 +336,8 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 &&
nsIContentPolicy::TYPE_INTERNAL_DTD == 47 && nsIContentPolicy::TYPE_INTERNAL_DTD == 47 &&
nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD == 48 && nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD == 48 &&
nsIContentPolicy::TYPE_INTERNAL_AUDIOWORKLET == 49 && nsIContentPolicy::TYPE_INTERNAL_AUDIOWORKLET == 49 &&
nsIContentPolicy::TYPE_INTERNAL_PAINTWORKLET == 50, nsIContentPolicy::TYPE_INTERNAL_PAINTWORKLET == 50 &&
nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD == 51,
"nsContentPolicyType values are as expected"); "nsContentPolicyType values are as expected");
namespace { namespace {

1
dom/fetch/InternalRequest.cpp
View File

@ -293,6 +293,7 @@ RequestDestination InternalRequest::MapContentPolicyTypeToRequestDestination(
destination = RequestDestination::_empty; destination = RequestDestination::_empty;
break; break;
case nsIContentPolicy::TYPE_FONT: case nsIContentPolicy::TYPE_FONT:
case nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD:
destination = RequestDestination::Font; destination = RequestDestination::Font;
break; break;
case nsIContentPolicy::TYPE_MEDIA: case nsIContentPolicy::TYPE_MEDIA:

2
dom/fetch/InternalRequest.h
View File

@ -42,7 +42,7 @@ namespace dom {
* audioworklet | TYPE_INTERNAL_AUDIOWORKLET * audioworklet | TYPE_INTERNAL_AUDIOWORKLET
* document | TYPE_DOCUMENT, TYPE_INTERNAL_IFRAME, TYPE_SUBDOCUMENT * document | TYPE_DOCUMENT, TYPE_INTERNAL_IFRAME, TYPE_SUBDOCUMENT
* embed | TYPE_INTERNAL_EMBED * embed | TYPE_INTERNAL_EMBED
* font | TYPE_FONT * font | TYPE_FONT, TYPE_INTERNAL_FONT_PRELOAD
* image | TYPE_INTERNAL_IMAGE, TYPE_INTERNAL_IMAGE_PRELOAD, * image | TYPE_INTERNAL_IMAGE, TYPE_INTERNAL_IMAGE_PRELOAD,
* | TYPE_IMAGE, TYPE_INTERNAL_IMAGE_FAVICON, TYPE_IMAGESET * | TYPE_IMAGE, TYPE_INTERNAL_IMAGE_FAVICON, TYPE_IMAGESET
* manifest | TYPE_WEB_MANIFEST * manifest | TYPE_WEB_MANIFEST

1
dom/security/SecFetch.cpp
View File

@ -75,6 +75,7 @@ nsCString MapInternalContentPolicyTypeToDest(nsContentPolicyType aType) {
case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD:
return NS_LITERAL_CSTRING("empty"); return NS_LITERAL_CSTRING("empty");
case nsIContentPolicy::TYPE_FONT: case nsIContentPolicy::TYPE_FONT:
case nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD:
return NS_LITERAL_CSTRING("font"); return NS_LITERAL_CSTRING("font");
case nsIContentPolicy::TYPE_MEDIA: case nsIContentPolicy::TYPE_MEDIA:
return NS_LITERAL_CSTRING("empty"); return NS_LITERAL_CSTRING("empty");

1
dom/security/nsCSPUtils.cpp
View File

@ -271,6 +271,7 @@ CSPDirective CSP_ContentTypeToDirective(nsContentPolicyType aType) {
return nsIContentSecurityPolicy::STYLE_SRC_DIRECTIVE; return nsIContentSecurityPolicy::STYLE_SRC_DIRECTIVE;
case nsIContentPolicy::TYPE_FONT: case nsIContentPolicy::TYPE_FONT:
case nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD:
return nsIContentSecurityPolicy::FONT_SRC_DIRECTIVE; return nsIContentSecurityPolicy::FONT_SRC_DIRECTIVE;
case nsIContentPolicy::TYPE_MEDIA: case nsIContentPolicy::TYPE_MEDIA: