From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Fri, 17 Feb 2012 02:47:00 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/mozilla/pdf.js into stats
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5e818ce04f758644b8f35c0feb1f8fb8999b226b;p=pdf.js.git

Merge branch 'master' of https://github.com/mozilla/pdf.js into stats
---

5e818ce04f758644b8f35c0feb1f8fb8999b226b
diff --cc src/core.js
index a737e6e,86e3eeb..f09ed92
--- a/src/core.js
+++ b/src/core.js
@@@ -249,11 -264,10 +266,11 @@@ var Page = (function PageClosure() 
  
        var self = this;
        function next() {
-         startIdx = gfx.executeIRQueue(IRQueue, startIdx, next);
+         startIdx = gfx.executeIRQueue(IRQueue, startIdx, next, stepper);
          if (startIdx == length) {
 -          self.stats.render = Date.now();
            gfx.endDrawing();
 +          bench.timeEnd('Rendering');
 +          bench.timeEnd('Overall');
            if (callback) callback();
          }
        }
diff --cc web/viewer.js
index de32aca,5e94c22..27e79a3
--- a/web/viewer.js
+++ b/web/viewer.js
@@@ -864,8 -866,12 +867,11 @@@ var PageView = function pageView(contai
      // Rendering area
  
      var self = this;
 -    stats.begin = Date.now();
      this.content.startRendering(ctx, function pageViewDrawCallback(error) {
-       div.removeChild(self.loadingIconDiv);
+       if (self.loadingIconDiv) {
+         div.removeChild(self.loadingIconDiv);
+         delete self.loadingIconDiv;
+       }
  
        if (error)
          PDFView.error('An error occurred while rendering the page.', error);
@@@ -1116,17 -1114,33 +1117,38 @@@ window.addEventListener('load', functio
      document.getElementById('fileInput').value = null;
    }
  
-   if ('disableWorker' in params)
-     PDFJS.disableWorker = (params['disableWorker'] === 'true');
+   // Special debugging flags in the hash section of the URL.
+   var hash = document.location.hash.substring(1);
+   var hashParams = PDFView.parseQueryString(hash);
+ 
+   if ('disableWorker' in hashParams)
+     PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
  
-   if ('disableTextLayer' in params)
-     PDFJS.disableTextLayer = (params['disableTextLayer'] === 'true');
+   if ('disableTextLayer' in hashParams)
+     PDFJS.disableTextLayer = (hashParams['disableTextLayer'] === 'true');
+ 
+   if ('pdfBug' in hashParams) {
+     PDFJS.pdfBug = true;
+     var pdfBug = hashParams['pdfBug'];
+     var all = false, enabled = [];
+     if (pdfBug === 'all')
+       all = true;
+     else
+       enabled = pdfBug.split(',');
+     var debugTools = PDFBug.tools;
+     for (var i = 0; i < debugTools.length; ++i) {
+       var tool = debugTools[i];
+       if (all || enabled.indexOf(tool.id) !== -1)
+         tool.enabled = true;
+     }
+     PDFBug.init();
+   }
  
 +  if ('enableBench' in params)
 +    PDFJS.enableBench = (params['enableBench'] === 'true');
 +  if (PDFJS.enableBench)
 +    document.getElementById('info').style.display = 'block';
 +
    var sidebarScrollView = document.getElementById('sidebarScrollView');
    sidebarScrollView.addEventListener('scroll', updateThumbViewArea, true);
  }, true);