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

Merge pull request #10990 from Snuffleupagus/onBeforeDraw-onAfterDraw

Browse Source 
Refactor the `onBeforeDraw`/`onAfterDraw` functionality used in `BaseViewer` and `PDFPageView`
This commit is contained in:
Tim van der Meij 2019-07-19 22:35:41 +02:00 committed by GitHub
commit b964df53da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
web/base_viewer.js
View File

@ -157,6 +157,7 @@ class BaseViewer {
this.scroll = watchScroll(this.container, this._scrollUpdate.bind(this)); this.scroll = watchScroll(this.container, this._scrollUpdate.bind(this));
this.presentationModeState = PresentationModeState.UNKNOWN; this.presentationModeState = PresentationModeState.UNKNOWN;
this._onBeforeDraw = this._onAfterDraw = null;
this._resetView(); this._resetView();
if (this.removePageBorders) { if (this.removePageBorders) {
@ -387,23 +388,31 @@ class BaseViewer {
const onePageRenderedCapability = createPromiseCapability(); const onePageRenderedCapability = createPromiseCapability();
this.onePageRendered = onePageRenderedCapability.promise; this.onePageRendered = onePageRenderedCapability.promise;
let bindOnAfterAndBeforeDraw = (pageView) => { const firstPagePromise = pdfDocument.getPage(1);
pageView.onBeforeDraw = () => {
// Add the page to the buffer at the start of drawing. That way it can
// be evicted from the buffer and destroyed even if we pause its
// rendering.
this._buffer.push(pageView);
};
pageView.onAfterDraw = () => {
if (!onePageRenderedCapability.settled) {
onePageRenderedCapability.resolve();
}
};
};
let firstPagePromise = pdfDocument.getPage(1);
this.firstPagePromise = firstPagePromise; this.firstPagePromise = firstPagePromise;
this._onBeforeDraw = (evt) => {
const pageView = this._pages[evt.pageNumber - 1];
if (!pageView) {
return;
}
// Add the page to the buffer at the start of drawing. That way it can be
// evicted from the buffer and destroyed even if we pause its rendering.
this._buffer.push(pageView);
};
this.eventBus.on('pagerender', this._onBeforeDraw);
this._onAfterDraw = (evt) => {
if (evt.cssTransform || onePageRenderedCapability.settled) {
return;
}
onePageRenderedCapability.resolve();
this.eventBus.off('pagerendered', this._onAfterDraw);
this._onAfterDraw = null;
};
this.eventBus.on('pagerendered', this._onAfterDraw);
// Fetch a single page so we can get a viewport that will be the default // Fetch a single page so we can get a viewport that will be the default
// viewport for all pages // viewport for all pages
firstPagePromise.then((pdfPage) => { firstPagePromise.then((pdfPage) => {
@ -432,7 +441,6 @@ class BaseViewer {
maxCanvasPixels: this.maxCanvasPixels, maxCanvasPixels: this.maxCanvasPixels,
l10n: this.l10n, l10n: this.l10n,
}); });
bindOnAfterAndBeforeDraw(pageView);
this._pages.push(pageView); this._pages.push(pageView);
} }
if (this._spreadMode !== SpreadMode.NONE) { if (this._spreadMode !== SpreadMode.NONE) {
@ -521,6 +529,14 @@ class BaseViewer {
this._scrollMode = ScrollMode.VERTICAL; this._scrollMode = ScrollMode.VERTICAL;
this._spreadMode = SpreadMode.NONE; this._spreadMode = SpreadMode.NONE;
if (this._onBeforeDraw) {
this.eventBus.off('pagerender', this._onBeforeDraw);
this._onBeforeDraw = null;
}
if (this._onAfterDraw) {
this.eventBus.off('pagerendered', this._onAfterDraw);
this._onAfterDraw = null;
}
// Remove the pages from the DOM... // Remove the pages from the DOM...
this.viewer.textContent = ''; this.viewer.textContent = '';
// ... and reset the Scroll mode CSS class(es) afterwards. // ... and reset the Scroll mode CSS class(es) afterwards.

14
web/pdf_page_view.js
View File

@ -96,9 +96,6 @@ class PDFPageView {
this.resume = null; this.resume = null;
this.error = null; this.error = null;
this.onBeforeDraw = null;
this.onAfterDraw = null;
this.annotationLayer = null; this.annotationLayer = null;
this.textLayer = null; this.textLayer = null;
this.zoomLayer = null; this.zoomLayer = null;
@ -451,9 +448,7 @@ class PDFPageView {
this.error = error; this.error = error;
this.stats = pdfPage.stats; this.stats = pdfPage.stats;
if (this.onAfterDraw) {
this.onAfterDraw();
}
this.eventBus.dispatch('pagerendered', { this.eventBus.dispatch('pagerendered', {
source: this, source: this,
pageNumber: this.id, pageNumber: this.id,
@ -496,9 +491,10 @@ class PDFPageView {
} }
div.setAttribute('data-loaded', true); div.setAttribute('data-loaded', true);
if (this.onBeforeDraw) { this.eventBus.dispatch('pagerender', {
this.onBeforeDraw(); source: this,
} pageNumber: this.id,
});
return resultPromise; return resultPromise;
} }