Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,18 @@ function createWorkerBundle(defines) {
.pipe(webpack2Stream(workerFileConfig));
}

function createRendererWorkerBundle(defines) {
const rendererWorkerFileConfig = createWebpackConfig(defines, {
filename: defines.MINIFIED ? "pdf.renderer.min.mjs" : "pdf.renderer.mjs",
library: {
type: "module",
},
});
return gulp
.src("./src/pdf.renderer.js", { encoding: false })
.pipe(webpack2Stream(rendererWorkerFileConfig));
}

function createWebBundle(defines, options) {
const viewerFileConfig = createWebpackConfig(
defines,
Expand Down Expand Up @@ -1103,6 +1115,7 @@ function buildGeneric(defines, dir) {
return ordered([
createMainBundle(defines).pipe(gulp.dest(dir + "build")),
createWorkerBundle(defines).pipe(gulp.dest(dir + "build")),
createRendererWorkerBundle(defines).pipe(gulp.dest(dir + "build")),
createSandboxBundle(defines).pipe(gulp.dest(dir + "build")),
createWebBundle(defines, {
defaultPreferencesDir: defines.SKIP_BABEL
Expand Down Expand Up @@ -1294,6 +1307,7 @@ function buildMinified(defines, dir) {
return ordered([
createMainBundle(defines).pipe(gulp.dest(dir + "build")),
createWorkerBundle(defines).pipe(gulp.dest(dir + "build")),
createRendererWorkerBundle(defines).pipe(gulp.dest(dir + "build")),
createSandboxBundle(defines).pipe(gulp.dest(dir + "build")),
createImageDecodersBundle({ ...defines, IMAGE_DECODERS: true }).pipe(
gulp.dest(dir + "image_decoders")
Expand Down Expand Up @@ -1439,6 +1453,9 @@ gulp.task(
createWorkerBundle(defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "build")
),
createRendererWorkerBundle(defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "build")
),
createWebBundle(defines, { defaultPreferencesDir: "mozcentral/" }).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")
),
Expand Down Expand Up @@ -1536,6 +1553,9 @@ gulp.task(
createWorkerBundle(defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "build")
),
createRendererWorkerBundle(defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "build")
),
createSandboxBundle(defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "build")
),
Expand Down
1 change: 1 addition & 0 deletions src/core/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ class Page {

async getOperatorList({
handler,
rendererHandler,
sink,
task,
intent,
Expand Down
2 changes: 1 addition & 1 deletion src/core/evaluator.js
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ class PartialEvaluator {
// globally, check if the image is still cached locally on the main-thread
// to avoid having to re-parse the image (since that can be slow).
if (w * h > 250000 || hasMask) {
const localLength = await this.handler.sendWithPromise("commonobj", [
const localLength = await this.sendWithPromise("commonobj", [
objId,
"CopyLocalImage",
{ imageRef },
Expand Down
24 changes: 21 additions & 3 deletions src/core/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ class WorkerMessageHandler {

static setup(handler, port) {
let testMessageProcessed = false;
let rendererHandler = null;

handler.on("test", data => {
if (testMessageProcessed) {
return; // we already processed 'test' message once
Expand All @@ -94,12 +96,19 @@ class WorkerMessageHandler {

handler.on("configure", data => {
setVerbosityLevel(data.verbosity);
rendererHandler = new MessageHandler(
"worker-channel",
"renderer-channel",
data.channelPort
);
});

handler.on("GetDocRequest", data => this.createDocumentHandler(data, port));
handler.on("GetDocRequest", data =>
this.createDocumentHandler(data, port, rendererHandler)
);
}

static createDocumentHandler(docParams, port) {
static createDocumentHandler(docParams, port, rendererHandler) {
// This context is actually holds references on pdfManager and handler,
// until the latter is destroyed.
let pdfManager;
Expand Down Expand Up @@ -173,7 +182,11 @@ class WorkerMessageHandler {
const task = new WorkerTask("loadXfaResources");
startWorkerTask(task);

await pdfManager.ensureDoc("loadXfaResources", [handler, task]);
await pdfManager.ensureDoc("loadXfaResources", [
handler,
task,
rendererHandler,
]);
finishWorkerTask(task);
}

Expand Down Expand Up @@ -776,6 +789,7 @@ class WorkerMessageHandler {
page
.getOperatorList({
handler,
rendererHandler,
sink,
task,
intent: data.intent,
Expand Down Expand Up @@ -863,6 +877,10 @@ class WorkerMessageHandler {
return pdfManager.fontFallback(data.id, handler);
});

rendererHandler.on("FontFallback", function (data) {
return pdfManager.fontFallback(data.id, rendererHandler);
});

handler.on("Cleanup", function (data) {
return pdfManager.cleanup(/* manuallyTriggered = */ true);
});
Expand Down
Loading
Loading