Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the ObjectLoader use more efficient methods when determining if data needs to be loaded #11284

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/core/chunked_stream.js
Expand Up @@ -285,6 +285,12 @@ class ChunkedStream {
}
return missingChunks;
};
ChunkedStreamSubstream.prototype.allChunksLoaded = function() {
if (this.numChunksLoaded === this.numChunks) {
return true;
}
return this.getMissingChunks().length === 0;
timvandermeij marked this conversation as resolved.
Show resolved Hide resolved
};

const subStream = new ChunkedStreamSubstream();
subStream.pos = subStream.start = start;
Expand Down
29 changes: 14 additions & 15 deletions src/core/obj.js
Expand Up @@ -27,7 +27,6 @@ import { Lexer, Parser } from './parser';
import {
MissingDataException, toRomanNumerals, XRefEntryException, XRefParseException
} from './core_utils';
import { ChunkedStream } from './chunked_stream';
import { CipherTransformFactory } from './crypto';
import { ColorSpace } from './colorspace';

Expand Down Expand Up @@ -2039,13 +2038,13 @@ var FileSpec = (function FileSpecClosure() {
*/
let ObjectLoader = (function() {
function mayHaveChildren(value) {
return isRef(value) || isDict(value) || Array.isArray(value) ||
isStream(value);
return (value instanceof Ref) || (value instanceof Dict) ||
Array.isArray(value) || isStream(value);
}

function addChildren(node, nodesToVisit) {
if (isDict(node) || isStream(node)) {
let dict = isDict(node) ? node : node.dict;
if ((node instanceof Dict) || isStream(node)) {
let dict = (node instanceof Dict) ? node : node.dict;
let dictKeys = dict.getKeys();
for (let i = 0, ii = dictKeys.length; i < ii; i++) {
let rawValue = dict.getRaw(dictKeys[i]);
Expand All @@ -2072,14 +2071,14 @@ let ObjectLoader = (function() {
}

ObjectLoader.prototype = {
load() {
this.capability = createPromiseCapability();
// Don't walk the graph if all the data is already loaded.
if (!(this.xref.stream instanceof ChunkedStream) ||
this.xref.stream.getMissingChunks().length === 0) {
this.capability.resolve();
return this.capability.promise;
async load() {
// Don't walk the graph if all the data is already loaded; note that only
// `ChunkedStream` instances have a `allChunksLoaded` method.
if (!this.xref.stream.allChunksLoaded ||
this.xref.stream.allChunksLoaded()) {
return undefined;
}
this.capability = createPromiseCapability();

let { keys, dict, } = this;
this.refSet = new RefSet();
Expand All @@ -2105,7 +2104,7 @@ let ObjectLoader = (function() {
let currentNode = nodesToVisit.pop();

// Only references or chunked streams can cause missing data exceptions.
if (isRef(currentNode)) {
if (currentNode instanceof Ref) {
// Skip nodes that have already been visited.
if (this.refSet.has(currentNode)) {
continue;
Expand All @@ -2126,7 +2125,7 @@ let ObjectLoader = (function() {
let foundMissingData = false;
for (let i = 0, ii = baseStreams.length; i < ii; i++) {
let stream = baseStreams[i];
if (stream.getMissingChunks && stream.getMissingChunks().length) {
if (stream.allChunksLoaded && !stream.allChunksLoaded()) {
foundMissingData = true;
pendingRequests.push({ begin: stream.start, end: stream.end, });
}
Expand All @@ -2145,7 +2144,7 @@ let ObjectLoader = (function() {
let node = nodesToRevisit[i];
// Remove any reference nodes from the current `RefSet` so they
// aren't skipped when we revist them.
if (isRef(node)) {
if (node instanceof Ref) {
this.refSet.remove(node);
}
}
Expand Down