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

Merge pull request #14370 from Snuffleupagus/getPageDict-sync-Pages

Browse Source 
Slightly reduce asynchronicity in the `Catalog.getPageDict` method (PR 14338 follow-up)
This commit is contained in:
Tim van der Meij 2021-12-15 19:40:39 +01:00 committed by GitHub
commit d3e1d7090a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/catalog.js
View File

@ -70,9 +70,13 @@ class Catalog {
this.xref = xref; this.xref = xref;
this._catDict = xref.getCatalogObj(); this._catDict = xref.getCatalogObj();
if (!isDict(this._catDict)) { if (!(this._catDict instanceof Dict)) {
throw new FormatError("Catalog object is not a dictionary."); throw new FormatError("Catalog object is not a dictionary.");
} }
// Given that `XRef.parse` will both fetch *and* validate the /Pages-entry,
// the following call must always succeed here:
this.toplevelPagesDict; // eslint-disable-line no-unused-expressions
this._actualNumPages = null; this._actualNumPages = null;
this.fontCache = new RefSetCache(); this.fontCache = new RefSetCache();
@ -1089,8 +1093,13 @@ class Catalog {
getPageDict(pageIndex) { getPageDict(pageIndex) {
const capability = createPromiseCapability(); const capability = createPromiseCapability();
const nodesToVisit = [this._catDict.getRaw("Pages")]; const nodesToVisit = [this.toplevelPagesDict];
const visitedNodes = new RefSet(); const visitedNodes = new RefSet();
const pagesRef = this._catDict.getRaw("Pages");
if (pagesRef instanceof Ref) {
visitedNodes.put(pagesRef);
}
const xref = this.xref, const xref = this.xref,
pageKidsCountCache = this.pageKidsCountCache; pageKidsCountCache = this.pageKidsCountCache;
let currentPageIndex = 0; let currentPageIndex = 0;
@ -1099,7 +1108,7 @@ class Catalog {
while (nodesToVisit.length) { while (nodesToVisit.length) {
const currentNode = nodesToVisit.pop(); const currentNode = nodesToVisit.pop();
if (isRef(currentNode)) { if (currentNode instanceof Ref) {
const count = pageKidsCountCache.get(currentNode); const count = pageKidsCountCache.get(currentNode);
// Skip nodes where the page can't be. // Skip nodes where the page can't be.
if (count >= 0 && currentPageIndex + count <= pageIndex) { if (count >= 0 && currentPageIndex + count <= pageIndex) {
@ -1139,7 +1148,7 @@ class Catalog {
} }
// Must be a child page dictionary. // Must be a child page dictionary.
if (!isDict(currentNode)) { if (!(currentNode instanceof Dict)) {
capability.reject( capability.reject(
new FormatError( new FormatError(
"Page dictionary kid reference points to wrong type of object." "Page dictionary kid reference points to wrong type of object."
@ -1228,6 +1237,11 @@ class Catalog {
getAllPageDicts(recoveryMode = false) { getAllPageDicts(recoveryMode = false) {
const queue = [{ currentNode: this.toplevelPagesDict, posInKids: 0 }]; const queue = [{ currentNode: this.toplevelPagesDict, posInKids: 0 }];
const visitedNodes = new RefSet(); const visitedNodes = new RefSet();
const pagesRef = this._catDict.getRaw("Pages");
if (pagesRef instanceof Ref) {
visitedNodes.put(pagesRef);
}
const map = new Map(); const map = new Map();
let pageIndex = 0; let pageIndex = 0;