From 7c35f10af84776b709bdd155a3cd794519f142e1 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 12 Apr 2012 13:04:03 -0700
Subject: [PATCH] Fix thumbnail view.
---
src/core.js | 4 ----
web/viewer.js | 19 +++++++++++++------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/core.js b/src/core.js
index ed35ce49e..bba95ab06 100644
--- a/src/core.js
+++ b/src/core.js
@@ -300,10 +300,6 @@ var Page = (function PageClosure() {
items.push(item);
}
return items;
- },
- startRendering: function Page_startRendering(ctx, viewport,
- callback, textLayer) {
-/// DELETE
}
};
diff --git a/web/viewer.js b/web/viewer.js
index bda342aa7..4a6a91e7a 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1036,9 +1036,9 @@ var ThumbnailView = function thumbnailView(container, pdfPage, id) {
this.id = id;
var maxThumbSize = 134;
- var canvasWidth = pageRatio >= 1 ? maxThumbSize :
+ var canvasWidth = this.width = pageRatio >= 1 ? maxThumbSize :
maxThumbSize * pageRatio;
- var canvasHeight = pageRatio <= 1 ? maxThumbSize :
+ var canvasHeight = this.height = pageRatio <= 1 ? maxThumbSize :
maxThumbSize / pageRatio;
var scaleX = this.scaleX = (canvasWidth / pageWidth);
var scaleY = this.scaleY = (canvasHeight / pageHeight);
@@ -1083,11 +1083,18 @@ var ThumbnailView = function thumbnailView(container, pdfPage, id) {
var ctx = getPageDrawContext();
var drawViewport = pdfPage.getViewport(scaleX);
- page.startRendering(ctx, drawViewport,
- function thumbnailViewDrawStartRendering() {
+ var renderContext = {
+ canvasContext: ctx,
+ viewport: drawViewport
+ };
+ pdfPage.render(renderContext).then(
+ function pdfPageRenderCallback() {
callback();
- });
-
+ },
+ function pdfPageRenderError(error) {
+ callback();
+ }
+ );
this.hasImage = true;
};