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

Change the signature of TranslatedFont, and convert it to a proper class

Browse Source 
In preparation for the next patch, this changes the signature of `TranslatedFont` to take an object rather than individual parameters. This also, in my opinion, makes the call-sites easier to read since it essentially provides a small bit of documentation of the arguments.

Finally, since it was necessary to touch `TranslatedFont` anyway it seemed like a good idea to also convert it to a proper `class`.
This commit is contained in:
Jonas Jenwald 2020-04-03 10:19:02 +02:00
parent 0400109b87
commit 2619272d73
1 changed files with 108 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
src/core/evaluator.js
View File

@ -803,11 +803,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
this.handler.send("UnsupportedFeature", { this.handler.send("UnsupportedFeature", {
featureId: UNSUPPORTED_FEATURES.font, featureId: UNSUPPORTED_FEATURES.font,
}); });
return new TranslatedFont( return new TranslatedFont({
"g_font_error", loadedName: "g_font_error",
new ErrorFont("Type3 font load error: " + reason), font: new ErrorFont(`Type3 font load error: ${reason}`),
translated.font dict: translated.font,
); });
}); });
}) })
.then(translated => { .then(translated => {
@ -958,11 +958,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
loadFont: function PartialEvaluator_loadFont(fontName, font, resources) { loadFont: function PartialEvaluator_loadFont(fontName, font, resources) {
function errorFont() { function errorFont() {
return Promise.resolve( return Promise.resolve(
new TranslatedFont( new TranslatedFont({
"g_font_error", loadedName: "g_font_error",
new ErrorFont("Font " + fontName + " is not available"), font: new ErrorFont(`Font "${fontName}" is not available.`),
font dict: font,
) })
); );
} }
@ -1103,7 +1103,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
fontCapability.resolve( fontCapability.resolve(
new TranslatedFont(font.loadedName, translatedFont, font) new TranslatedFont({
loadedName: font.loadedName,
font: translatedFont,
dict: font,
})
); );
}) })
.catch(reason => { .catch(reason => {
@ -1126,11 +1130,13 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} catch (ex) {} } catch (ex) {}
fontCapability.resolve( fontCapability.resolve(
new TranslatedFont( new TranslatedFont({
font.loadedName, loadedName: font.loadedName,
new ErrorFont(reason instanceof Error ? reason.message : reason), font: new ErrorFont(
font reason instanceof Error ? reason.message : reason
) ),
dict: font,
})
); );
}); });
return fontCapability.promise; return fontCapability.promise;
@ -3266,107 +3272,104 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return PartialEvaluator; return PartialEvaluator;
})(); })();
var TranslatedFont = (function TranslatedFontClosure() { class TranslatedFont {
// eslint-disable-next-line no-shadow constructor({ loadedName, font, dict }) {
function TranslatedFont(loadedName, font, dict) {
this.loadedName = loadedName; this.loadedName = loadedName;
this.font = font; this.font = font;
this.dict = dict; this.dict = dict;
this.type3Loaded = null; this.type3Loaded = null;
this.sent = false; this.sent = false;
} }
TranslatedFont.prototype = {
send(handler) {
if (this.sent) {
return;
}
this.sent = true;
handler.send("commonobj", [ send(handler) {
this.loadedName, if (this.sent) {
"Font", return;
this.font.exportData(), }
]); this.sent = true;
},
fallback(handler) { handler.send("commonobj", [
if (!this.font.data) { this.loadedName,
return; "Font",
} this.font.exportData(),
// When font loading failed, fall back to the built-in font renderer. ]);
this.font.disableFontFace = true; }
// An arbitrary number of text rendering operators could have been
// encountered between the point in time when the 'Font' message was sent
// to the main-thread, and the point in time when the 'FontFallback'
// message was received on the worker-thread.
// To ensure that all 'FontPath's are available on the main-thread, when
// font loading failed, attempt to resend *all* previously parsed glyphs.
const glyphs = this.font.glyphCacheValues;
PartialEvaluator.buildFontPaths(this.font, glyphs, handler);
},
loadType3Data(evaluator, resources, parentOperatorList, task) { fallback(handler) {
if (!this.font.isType3Font) { if (!this.font.data) {
throw new Error("Must be a Type3 font."); return;
} }
// When font loading failed, fall back to the built-in font renderer.
this.font.disableFontFace = true;
// An arbitrary number of text rendering operators could have been
// encountered between the point in time when the 'Font' message was sent
// to the main-thread, and the point in time when the 'FontFallback'
// message was received on the worker-thread.
// To ensure that all 'FontPath's are available on the main-thread, when
// font loading failed, attempt to resend *all* previously parsed glyphs.
const glyphs = this.font.glyphCacheValues;
PartialEvaluator.buildFontPaths(this.font, glyphs, handler);
}
if (this.type3Loaded) { loadType3Data(evaluator, resources, parentOperatorList, task) {
return this.type3Loaded; if (!this.font.isType3Font) {
} throw new Error("Must be a Type3 font.");
// When parsing Type3 glyphs, always ignore them if there are errors. }
// Compared to the parsing of e.g. an entire page, it doesn't really
// make sense to only be able to render a Type3 glyph partially.
//
// Also, ensure that any Type3 image resources (which should be very rare
// in practice) are completely decoded on the worker-thread, to simplify
// the rendering code on the main-thread (see issue10717.pdf).
var type3Options = Object.create(evaluator.options);
type3Options.ignoreErrors = false;
type3Options.nativeImageDecoderSupport = NativeImageDecoding.NONE;
var type3Evaluator = evaluator.clone(type3Options);
type3Evaluator.parsingType3Font = true;
var translatedFont = this.font; if (this.type3Loaded) {
var loadCharProcsPromise = Promise.resolve();
var charProcs = this.dict.get("CharProcs");
var fontResources = this.dict.get("Resources") || resources;
var charProcKeys = charProcs.getKeys();
var charProcOperatorList = Object.create(null);
for (var i = 0, n = charProcKeys.length; i < n; ++i) {
const key = charProcKeys[i];
loadCharProcsPromise = loadCharProcsPromise.then(function() {
var glyphStream = charProcs.get(key);
var operatorList = new OperatorList();
return type3Evaluator
.getOperatorList({
stream: glyphStream,
task,
resources: fontResources,
operatorList,
})
.then(function() {
charProcOperatorList[key] = operatorList.getIR();
// Add the dependencies to the parent operator list so they are
// resolved before sub operator list is executed synchronously.
parentOperatorList.addDependencies(operatorList.dependencies);
})
.catch(function(reason) {
warn(`Type3 font resource "${key}" is not available.`);
const dummyOperatorList = new OperatorList();
charProcOperatorList[key] = dummyOperatorList.getIR();
});
});
}
this.type3Loaded = loadCharProcsPromise.then(function() {
translatedFont.charProcOperatorList = charProcOperatorList;
});
return this.type3Loaded; return this.type3Loaded;
}, }
}; // When parsing Type3 glyphs, always ignore them if there are errors.
return TranslatedFont; // Compared to the parsing of e.g. an entire page, it doesn't really
})(); // make sense to only be able to render a Type3 glyph partially.
//
// Also, ensure that any Type3 image resources (which should be very rare
// in practice) are completely decoded on the worker-thread, to simplify
// the rendering code on the main-thread (see issue10717.pdf).
var type3Options = Object.create(evaluator.options);
type3Options.ignoreErrors = false;
type3Options.nativeImageDecoderSupport = NativeImageDecoding.NONE;
var type3Evaluator = evaluator.clone(type3Options);
type3Evaluator.parsingType3Font = true;
var translatedFont = this.font;
var loadCharProcsPromise = Promise.resolve();
var charProcs = this.dict.get("CharProcs");
var fontResources = this.dict.get("Resources") || resources;
var charProcKeys = charProcs.getKeys();
var charProcOperatorList = Object.create(null);
for (var i = 0, n = charProcKeys.length; i < n; ++i) {
const key = charProcKeys[i];
loadCharProcsPromise = loadCharProcsPromise.then(function() {
var glyphStream = charProcs.get(key);
var operatorList = new OperatorList();
return type3Evaluator
.getOperatorList({
stream: glyphStream,
task,
resources: fontResources,
operatorList,
})
.then(function() {
charProcOperatorList[key] = operatorList.getIR();
// Add the dependencies to the parent operator list so they are
// resolved before sub operator list is executed synchronously.
parentOperatorList.addDependencies(operatorList.dependencies);
})
.catch(function(reason) {
warn(`Type3 font resource "${key}" is not available.`);
const dummyOperatorList = new OperatorList();
charProcOperatorList[key] = dummyOperatorList.getIR();
});
});
}
this.type3Loaded = loadCharProcsPromise.then(function() {
translatedFont.charProcOperatorList = charProcOperatorList;
});
return this.type3Loaded;
}
}
var StateManager = (function StateManagerClosure() { var StateManager = (function StateManagerClosure() {
// eslint-disable-next-line no-shadow // eslint-disable-next-line no-shadow