Merge pull request mozilla#2614 from yurydelendik/intermit-fullscreen

Fixes intermittent rendering stop
SeraphMX · Jan 30, 2013 · f18655f · f18655f
2 parents 0f9b63e + ddcbc4d
commit f18655f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/web/viewer.js b/web/viewer.js
@@ -2093,7 +2093,12 @@ var PageView = function pageView(container, pdfPage, id, scale,
     // Rendering area
 
     var self = this;
+    var renderingWasReset = false;
     function pageViewDrawCallback(error) {
+      if (renderingWasReset) {
+        return;
+      }
+
       self.renderingState = RenderingStates.FINISHED;
 
       if (self.loadingIconDiv) {
@@ -2128,6 +2133,12 @@ var PageView = function pageView(container, pdfPage, id, scale,
       viewport: this.viewport,
       textLayer: textLayer,
       continueCallback: function pdfViewcContinueCallback(cont) {
+        if (self.renderingState === RenderingStates.INITIAL) {
+          // The page update() was called, we just need to abort any rendering.
+          renderingWasReset = true;
+          return;
+        }
+
         if (PDFView.highestPriorityPage !== 'page' + self.id) {
           self.renderingState = RenderingStates.PAUSED;
           self.resume = function resumeCallback() {