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

Ensure that pre-rendering works correctly with spreadModes at higher zoom levels

Browse Source 
Having recently worked with this code, in PR 14096 (and indirectly in PR 14112), I happened to notice a pre-existing issue with spreadModes at higher zoom levels.
The `PDFRenderingQueue` code was written back when the viewer only supported "normal" vertical scrolling, and some edge-cases related to spreadModes are thus not perfectly supported. Depending on the zoom level, it's possible that there are "holes" in the currently visible page layout, and those pages will not be pre-rendered as you'd expect.

*Steps to reproduce:*

 0. Open the viewer, e.g. https://mozilla.github.io/pdf.js/web/viewer.html
 1. Enable vertical scrolling.
 2. Enable the ODD spreadMode.
 3. Scroll down, such that both pages 1 and 3 are visible.
 4. Zoom-in until *only* page 1 and 3 are visible.
 5. Open the devtools and, using the DOM Inspector, notice how page 2 is *not* being pre-rendered despite all surrounding pages being rendered.
This commit is contained in:
Jonas Jenwald 2021-10-13 15:42:20 +02:00
parent f6d9d91965
commit 08e2427f9c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/pdf_rendering_queue.js
View File

@ -126,10 +126,24 @@ class PDFRenderingQueue {
return view; return view;
} }
} }
const firstId = visible.first.id,
lastId = visible.last.id;
// All the visible views have rendered; try to handle any "holes" in the
// page layout (can happen e.g. with spreadModes at higher zoom levels).
if (lastId - firstId > 1) {
for (let i = 0, ii = lastId - firstId; i <= ii; i++) {
const holeId = scrolledDown ? firstId + i : lastId - i,
holeView = views[holeId - 1];
if (!this.isViewFinished(holeView)) {
return holeView;
}
}
}
// All the visible views have rendered; try to render next/previous page. // All the visible views have rendered; try to render next/previous page.
// (IDs start at 1, so no need to add 1 when `scrolledDown === true`.) // (IDs start at 1, so no need to add 1 when `scrolledDown === true`.)
let preRenderIndex = scrolledDown ? visible.last.id : visible.first.id - 2; let preRenderIndex = scrolledDown ? lastId : firstId - 2;
let preRenderView = views[preRenderIndex]; let preRenderView = views[preRenderIndex];
if (preRenderView && !this.isViewFinished(preRenderView)) { if (preRenderView && !this.isViewFinished(preRenderView)) {