ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-08 17:30:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16368 from Snuffleupagus/rm-GlobalImageCache-addPageIndex

Browse source 
Inline the `addPageIndex` method in `GlobalImageCache.shouldCache`
This commit is contained in:
Jonas Jenwald 2023-05-04 12:09:04 +02:00 • committed by GitHub
commit 667085ee33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/evaluator.js
View file

@ -822,10 +822,9 @@ class PartialEvaluator {
if (imageRef) { if (imageRef) {
this._regionalImageCache.set(/* name = */ null, imageRef, cacheData); this._regionalImageCache.set(/* name = */ null, imageRef, cacheData);
assert(!isInline, "Cannot cache an inline image globally.");
this.globalImageCache.addPageIndex(imageRef, this.pageIndex);
if (cacheGlobally) { if (cacheGlobally) {
assert(!isInline, "Cannot cache an inline image globally.");
this.globalImageCache.setData(imageRef, { this.globalImageCache.setData(imageRef, {
objId, objId,
fn: OPS.paintImageXObject, fn: OPS.paintImageXObject,

25
src/core/image_utils.js
View file

@ -208,27 +208,20 @@ class GlobalImageCache {
} }
shouldCache(ref, pageIndex) { shouldCache(ref, pageIndex) {
const pageIndexSet = this._refCache.get(ref);
const numPages = pageIndexSet
? pageIndexSet.size + (pageIndexSet.has(pageIndex) ? 0 : 1)
: 1;
if (numPages < GlobalImageCache.NUM_PAGES_THRESHOLD) {
return false;
}
if (!this._imageCache.has(ref) && this._cacheLimitReached) {
return false;
}
return true;
}
addPageIndex(ref, pageIndex) {
let pageIndexSet = this._refCache.get(ref); let pageIndexSet = this._refCache.get(ref);
if (!pageIndexSet) { if (!pageIndexSet) {
pageIndexSet = new Set(); pageIndexSet = new Set();
this._refCache.put(ref, pageIndexSet); this._refCache.put(ref, pageIndexSet);
} }
pageIndexSet.add(pageIndex); pageIndexSet.add(pageIndex);
if (pageIndexSet.size < GlobalImageCache.NUM_PAGES_THRESHOLD) {
return false;
}
if (!this._imageCache.has(ref) && this._cacheLimitReached) {
return false;
}
return true;
} }
/** /**
@ -266,7 +259,7 @@ class GlobalImageCache {
setData(ref, data) { setData(ref, data) {
if (!this._refCache.has(ref)) { if (!this._refCache.has(ref)) {
throw new Error( throw new Error(
'GlobalImageCache.setData - expected "addPageIndex" to have been called.' 'GlobalImageCache.setData - expected "shouldCache" to have been called.'
); );
} }
if (this._imageCache.has(ref)) { if (this._imageCache.has(ref)) {