Merge and fix upstream conflict.

diff --cc web/viewer.js
index 00de7feaf08a39a7548428d5f9ef066512f595f2,c8b8304315294f2342a73ba962c164ca2d0851cf..221c535eeab813cb72aa093f06a2a80bda05616c
--- 1/web/viewer.js
--- 2/web/viewer.js
+++ b/web/viewer.js
@@@ -512,9 -501,11 +526,16 @@@ var PageView = function pageView(contai
      ctx.translate(-this.x * scale, -this.y * scale);
  
      stats.begin = Date.now();
-     this.content.startRendering(ctx, this.updateStats, function(e) {
-       PDFView.error('An error occured while rendering the page.', e);
-     });
 -    this.content.startRendering(ctx, (function pageViewDrawCallback() {
 -      this.updateStats();
 -      if (this.onAfterDraw)
 -        this.onAfterDraw();
 -    }).bind(this));
++    this.content.startRendering(ctx, 
++      (function pageViewDrawCallback() {
++        this.updateStats();
++        if (this.onAfterDraw)
++          this.onAfterDraw();
++      }).bind(this),
++      function pageViewErrorback(e) {
++        PDFView.error('An error occured while rendering the page.', e);
++      }
++    );
  
      setupLinks(this.content, this.scale);
      div.setAttribute('data-loaded', true);