mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-25 01:28:06 +02:00
Code Activity

[api-minor] Move the handling of unbalanced markedContent to the worker-thread (PR 15630 follow-up)

Browse source
This commit is contained in:
Jonas Jenwald 2022-10-26 19:43:17 +02:00
parent 27b251ac99
commit 1e7274e9c6
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/evaluator.js
View file

@ -2283,12 +2283,16 @@ class PartialEvaluator {
sink,
seenStyles = new Set(),
viewBox,
markedContentData = null,
}) {
// Ensure that `resources`/`stateManager` is correctly initialized,
// even if the provided parameter is e.g. `null`.
resources = resources || Dict.empty;
stateManager = stateManager || new StateManager(new TextState());
if (includeMarkedContent) {
markedContentData = markedContentData || { level: 0 };
}
const NormalizedUnicodes = getNormalizedUnicodes();
const textContent = {
@ -3225,6 +3229,7 @@ class PartialEvaluator {
sink: sinkWrapper,
seenStyles,
viewBox,
markedContentData,
})
.then(function () {
if (!sinkWrapper.enqueueInvoked) {
@ -3305,6 +3310,8 @@ class PartialEvaluator {
case OPS.beginMarkedContent:
flushTextContentItem();
if (includeMarkedContent) {
markedContentData.level++;
textContent.items.push({
type: "beginMarkedContent",
tag: args[0] instanceof Name ? args[0].name : null,
@ -3314,6 +3321,8 @@ class PartialEvaluator {
case OPS.beginMarkedContentProps:
flushTextContentItem();
if (includeMarkedContent) {
markedContentData.level++;
let mcid = null;
if (args[1] instanceof Dict) {
mcid = args[1].get("MCID");
@ -3330,6 +3339,13 @@ class PartialEvaluator {
case OPS.endMarkedContent:
flushTextContentItem();
if (includeMarkedContent) {
if (markedContentData.level === 0) {
// Handle unbalanced beginMarkedContent/endMarkedContent
// operators (fixes issue15629.pdf).
break;
}
markedContentData.level--;
textContent.items.push({
type: "endMarkedContent",
});