Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13436 from Snuffleupagus/getPathGenerator-buf

Browse Source 
Re-factor FontFaceObject.getPathGenerator to use Arrays instead of strings
This commit is contained in:
Tim van der Meij 2021-05-25 20:35:01 +02:00 committed by GitHub
commit 6e92b56efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/display/font_loader.js
View File

@ -315,8 +315,8 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
this.insertRule(rule);
const names = [];
for (i = 0, ii = fonts.length; i < ii; i++) {
names.push(fonts[i].loadedName);
for (const font of fonts) {
names.push(font.loadedName);
}
names.push(loadTestFontId);
@ -326,10 +326,10 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
div.style.position = "absolute";
div.style.top = div.style.left = "0px";
for (i = 0, ii = names.length; i < ii; ++i) {
for (const name of names) {
const span = this._document.createElement("span");
span.textContent = "Hi";
span.style.fontFamily = names[i];
span.style.fontFamily = name;
div.appendChild(span);
}
this._document.body.appendChild(div);
@ -422,7 +422,7 @@ class FontFaceObject {
return this.compiledGlyphs[character];
}
let cmds, current;
let cmds;
try {
cmds = objs.get(this.loadedName + "_path_" + character);
} catch (ex) {
@ -441,27 +441,22 @@ class FontFaceObject {
// If we can, compile cmds into JS for MAXIMUM SPEED...
if (this.isEvalSupported && IsEvalSupportedCached.value) {
let args,
js = "";
for (let i = 0, ii = cmds.length; i < ii; i++) {
current = cmds[i];
if (current.args !== undefined) {
args = current.args.join(",");
} else {
args = "";
}
js += "c." + current.cmd + "(" + args + ");\n";
const jsBuf = [];
for (const current of cmds) {
const args = current.args !== undefined ? current.args.join(",") : "";
jsBuf.push("c.", current.cmd, "(", args, ");\n");
}
// eslint-disable-next-line no-new-func
return (this.compiledGlyphs[character] = new Function("c", "size", js));
return (this.compiledGlyphs[character] = new Function(
"c",
"size",
jsBuf.join("")
));
}
// ... but fall back on using Function.prototype.apply() if we're
// blocked from using eval() for whatever reason (like CSP policies).
return (this.compiledGlyphs[character] = function (c, size) {
for (let i = 0, ii = cmds.length; i < ii; i++) {
current = cmds[i];
for (const current of cmds) {
if (current.cmd === "scale") {
current.args = [size, -size];
}