mirror of
https://github.com/zen-browser/pdf.js.git
synced 2025-07-07 17:05:38 +02:00
Disable system fonts on Android (issue 18210)
To avoid introducing any inline "hacks" in the viewer-code this meant adding `useSystemFonts` to the AppOptions, which thus required some new functionality since the default value should be `undefined` given how the option is handled in the API; note [this code](ed83d7c5e1/src/display/api.js (L298-L301)
).
Finally, also moves the definition of the development-mode `window.isGECKOVIEW` property to the HTML file such that it's guaranteed to be set regardless of how and when it's accessed.
This commit is contained in:
parent
45ce3a057f
commit
80d6bf6319
4 changed files with 54 additions and 15 deletions
10
web/app.js
10
web/app.js
|
@ -1003,16 +1003,6 @@ const PDFViewerApplication = {
|
||||||
AppOptions.set("docBaseUrl", this.baseUrl);
|
AppOptions.set("docBaseUrl", this.baseUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// On Android, there is almost no chance to have the font we want so we
|
|
||||||
// don't use the system fonts in this case.
|
|
||||||
if (
|
|
||||||
typeof PDFJSDev === "undefined"
|
|
||||||
? window.isGECKOVIEW
|
|
||||||
: PDFJSDev.test("GECKOVIEW")
|
|
||||||
) {
|
|
||||||
args.useSystemFonts = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the necessary API parameters, using all the available options.
|
// Set the necessary API parameters, using all the available options.
|
||||||
const apiParams = AppOptions.getAll(OptionKind.API);
|
const apiParams = AppOptions.getAll(OptionKind.API);
|
||||||
const loadingTask = getDocument({
|
const loadingTask = getDocument({
|
||||||
|
|
|
@ -39,6 +39,14 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
|
||||||
compatParams.set("maxCanvasPixels", 5242880);
|
compatParams.set("maxCanvasPixels", 5242880);
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// Don't use system fonts on Android (issue 18210).
|
||||||
|
// Support: Android
|
||||||
|
(function () {
|
||||||
|
if (isAndroid) {
|
||||||
|
compatParams.set("useSystemFonts", false);
|
||||||
|
}
|
||||||
|
})();
|
||||||
}
|
}
|
||||||
|
|
||||||
const OptionKind = {
|
const OptionKind = {
|
||||||
|
@ -47,6 +55,7 @@ const OptionKind = {
|
||||||
API: 0x04,
|
API: 0x04,
|
||||||
WORKER: 0x08,
|
WORKER: 0x08,
|
||||||
EVENT_DISPATCH: 0x10,
|
EVENT_DISPATCH: 0x10,
|
||||||
|
UNDEF_ALLOWED: 0x20,
|
||||||
PREFERENCE: 0x80,
|
PREFERENCE: 0x80,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -377,6 +386,19 @@ const defaultOptions = {
|
||||||
: "../web/standard_fonts/",
|
: "../web/standard_fonts/",
|
||||||
kind: OptionKind.API,
|
kind: OptionKind.API,
|
||||||
},
|
},
|
||||||
|
useSystemFonts: {
|
||||||
|
// On Android, there is almost no chance to have the font we want so we
|
||||||
|
// don't use the system fonts in this case (bug 1882613).
|
||||||
|
/** @type {boolean|undefined} */
|
||||||
|
value: (
|
||||||
|
typeof PDFJSDev === "undefined"
|
||||||
|
? window.isGECKOVIEW
|
||||||
|
: PDFJSDev.test("GECKOVIEW")
|
||||||
|
)
|
||||||
|
? false
|
||||||
|
: undefined,
|
||||||
|
kind: OptionKind.API + OptionKind.UNDEF_ALLOWED,
|
||||||
|
},
|
||||||
verbosity: {
|
verbosity: {
|
||||||
/** @type {number} */
|
/** @type {number} */
|
||||||
value: 1,
|
value: 1,
|
||||||
|
@ -464,6 +486,11 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING || LIB")) {
|
||||||
if (kind & OptionKind.BROWSER) {
|
if (kind & OptionKind.BROWSER) {
|
||||||
throw new Error(`Cannot mix "PREFERENCE" and "BROWSER" kind: ${name}`);
|
throw new Error(`Cannot mix "PREFERENCE" and "BROWSER" kind: ${name}`);
|
||||||
}
|
}
|
||||||
|
if (kind & OptionKind.UNDEF_ALLOWED) {
|
||||||
|
throw new Error(
|
||||||
|
`Cannot allow \`undefined\` value for "PREFERENCE" kind: ${name}`
|
||||||
|
);
|
||||||
|
}
|
||||||
if (typeof compatParams === "object" && compatParams.has(name)) {
|
if (typeof compatParams === "object" && compatParams.has(name)) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Should not have compatibility-value for "PREFERENCE" kind: ${name}`
|
`Should not have compatibility-value for "PREFERENCE" kind: ${name}`
|
||||||
|
@ -478,6 +505,11 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING || LIB")) {
|
||||||
throw new Error(`Invalid value for "PREFERENCE" kind: ${name}`);
|
throw new Error(`Invalid value for "PREFERENCE" kind: ${name}`);
|
||||||
}
|
}
|
||||||
} else if (kind & OptionKind.BROWSER) {
|
} else if (kind & OptionKind.BROWSER) {
|
||||||
|
if (kind & OptionKind.UNDEF_ALLOWED) {
|
||||||
|
throw new Error(
|
||||||
|
`Cannot allow \`undefined\` value for "BROWSER" kind: ${name}`
|
||||||
|
);
|
||||||
|
}
|
||||||
if (typeof compatParams === "object" && compatParams.has(name)) {
|
if (typeof compatParams === "object" && compatParams.has(name)) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Should not have compatibility-value for "BROWSER" kind: ${name}`
|
`Should not have compatibility-value for "BROWSER" kind: ${name}`
|
||||||
|
@ -522,7 +554,14 @@ class AppOptions {
|
||||||
static set(name, value) {
|
static set(name, value) {
|
||||||
const defaultOpt = defaultOptions[name];
|
const defaultOpt = defaultOptions[name];
|
||||||
|
|
||||||
if (!defaultOpt || typeof value !== typeof defaultOpt.value) {
|
if (
|
||||||
|
!defaultOpt ||
|
||||||
|
!(
|
||||||
|
typeof value === typeof defaultOpt.value ||
|
||||||
|
(defaultOpt.kind & OptionKind.UNDEF_ALLOWED &&
|
||||||
|
(value === undefined || defaultOpt.value === undefined))
|
||||||
|
)
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
userOptions.set(name, value);
|
userOptions.set(name, value);
|
||||||
|
@ -535,7 +574,14 @@ class AppOptions {
|
||||||
const defaultOpt = defaultOptions[name],
|
const defaultOpt = defaultOptions[name],
|
||||||
userOpt = options[name];
|
userOpt = options[name];
|
||||||
|
|
||||||
if (!defaultOpt || typeof userOpt !== typeof defaultOpt.value) {
|
if (
|
||||||
|
!defaultOpt ||
|
||||||
|
!(
|
||||||
|
typeof userOpt === typeof defaultOpt.value ||
|
||||||
|
(defaultOpt.kind & OptionKind.UNDEF_ALLOWED &&
|
||||||
|
(userOpt === undefined || defaultOpt.value === undefined))
|
||||||
|
)
|
||||||
|
) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (prefs) {
|
if (prefs) {
|
||||||
|
|
|
@ -42,6 +42,12 @@ See https://github.com/adobe-type-tools/cmap-resources
|
||||||
<!--#endif-->
|
<!--#endif-->
|
||||||
|
|
||||||
<!--#if !MOZCENTRAL-->
|
<!--#if !MOZCENTRAL-->
|
||||||
|
<script>
|
||||||
|
if (typeof PDFJSDev === "undefined") {
|
||||||
|
window.isGECKOVIEW = true;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
<script type="importmap">
|
<script type="importmap">
|
||||||
{
|
{
|
||||||
"imports": {
|
"imports": {
|
||||||
|
|
|
@ -60,9 +60,6 @@ function getViewerConfiguration() {
|
||||||
function webViewerLoad() {
|
function webViewerLoad() {
|
||||||
const config = getViewerConfiguration();
|
const config = getViewerConfiguration();
|
||||||
|
|
||||||
if (typeof PDFJSDev === "undefined") {
|
|
||||||
window.isGECKOVIEW = true;
|
|
||||||
}
|
|
||||||
PDFViewerApplication.run(config);
|
PDFViewerApplication.run(config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue