nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1894779: Allow loading fonts from resource:// URIs r=emilio,freddyb

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D209593
This commit is contained in:
Tom Ritter 2024-05-23 13:46:30 +00:00
parent 73949b0565
commit e7fd7f8a7c
3 changed files with 37 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
caps/tests/mochitest/mochitest.toml
View file

@ -24,3 +24,6 @@ skip-if = [
] ]
["test_disallowInheritPrincipal.html"] ["test_disallowInheritPrincipal.html"]
["test_loadLocalFont.html"]
skip-if = ["os == 'android'"] # Font does not exist on Android

27
caps/tests/mochitest/test_loadLocalFont.html Normal file
View file

@ -0,0 +1,27 @@
<!DOCTYPE HTML>
<html>
<head>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="application/javascript">
try {
let LocalFiraSans = new FontFace(
"LocalFiraSans",
"url('chrome://pocket/content/panels/fonts/FiraSans-Regular.woff') format('woff')"
).load().then(() => {
ok(true, "We should suuceed");
}, () => {
ok(false, "We shouldn't fail (reject)");
});
console.log(LocalFiraSans); // avoid warning
} catch (e) {
ok(false, "We shouldn't fail (catch)" + e);
}
</script>
</pre>
</body>
</html>

9
layout/style/FontLoaderUtils.cpp
View file

@ -30,13 +30,18 @@ namespace mozilla {
// aCORSMode is ignored. We always load as crossorigin=anonymous, but a // aCORSMode is ignored. We always load as crossorigin=anonymous, but a
// preload started with anything other then "anonymous" will never be found. // preload started with anything other then "anonymous" will never be found.
aCorsMapping = aCorsMapping =
aURI->SchemeIs("file") aURI->SchemeIs("file") || aURI->SchemeIs("resource") ||
aURI->SchemeIs("chrome")
? nsContentSecurityManager::CORSSecurityMapping:: ? nsContentSecurityManager::CORSSecurityMapping::
CORS_NONE_MAPS_TO_INHERITED_CONTEXT CORS_NONE_MAPS_TO_INHERITED_CONTEXT
: nsContentSecurityManager::CORSSecurityMapping::REQUIRE_CORS_CHECKS; : nsContentSecurityManager::CORSSecurityMapping::REQUIRE_CORS_CHECKS;
// Besides the CORS flags, include SEC_ALLOW_CHROME to allow a font to come
// from a resource:// or chrome:// URL (as long as it is marked
// contentaccessible)
aSecurityFlags = nsContentSecurityManager::ComputeSecurityFlags( aSecurityFlags = nsContentSecurityManager::ComputeSecurityFlags(
CORSMode::CORS_NONE, aCorsMapping); CORSMode::CORS_NONE, aCorsMapping) |
nsILoadInfo::SEC_ALLOW_CHROME;
aContentPolicyType = aIsPreload ? nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD aContentPolicyType = aIsPreload ? nsIContentPolicy::TYPE_INTERNAL_FONT_PRELOAD
: nsIContentPolicy::TYPE_FONT; : nsIContentPolicy::TYPE_FONT;