From 494fd1ccf9eff089f1176bf8199ce15e9fe0488f Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Thu, 12 Apr 2012 14:02:47 -0700 Subject: [PATCH] Fixes make files, removes stats from backend, stepper --- Makefile | 1 + make.js | 1 + src/api.js | 3 ++- src/core.js | 5 ----- web/debugger.js | 32 ++++++++++++++++---------------- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 3cc423350..d4457e08f 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ all: bundle PDF_JS_FILES = \ core.js \ util.js \ + api.js \ canvas.js \ obj.js \ function.js \ diff --git a/make.js b/make.js index e0975fec8..2ee0d4cbd 100755 --- a/make.js +++ b/make.js @@ -79,6 +79,7 @@ target.bundle = function() { var SRC_FILES = ['core.js', 'util.js', + 'api.js', 'canvas.js', 'obj.js', 'function.js', diff --git a/src/api.js b/src/api.js index 72d8cae66..b14ea138d 100644 --- a/src/api.js +++ b/src/api.js @@ -80,6 +80,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { this.pageInfo = pageInfo; this.transport = transport; this._stats = new StatTimer(); + this._stats.enabled = !!globalScope.PDFJS.enableStats; this.objs = transport.objs; } PDFPageProxy.prototype = { @@ -206,7 +207,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { var operatorList = this.operatorList; var stepper = null; if (PDFJS.pdfBug && StepperManager.enabled) { - stepper = StepperManager.create(this.pageNumber); + stepper = StepperManager.create(this.pageNumber - 1); stepper.init(operatorList); stepper.nextBreakPoint = stepper.getNextBreakPoint(); } diff --git a/src/core.js b/src/core.js index bba95ab06..41f9a9c61 100644 --- a/src/core.js +++ b/src/core.js @@ -63,8 +63,6 @@ var Page = (function PageClosure() { function Page(xref, pageNumber, pageDict, ref) { this.pageNumber = pageNumber; this.pageDict = pageDict; - this.stats = new StatTimer(); - this.stats.enabled = !!globalScope.PDFJS.enableStats; this.xref = xref; this.ref = ref; @@ -139,8 +137,6 @@ var Page = (function PageClosure() { return this.operatorList; } - this.stats.time('Build IR Queue'); - var xref = this.xref; var content = this.content; var resources = this.resources; @@ -159,7 +155,6 @@ var Page = (function PageClosure() { xref, handler, 'p' + this.pageNumber + '_'); this.operatorList = pe.getOperatorList(content, resources, dependency); - this.stats.timeEnd('Build IR Queue'); return this.operatorList; }, diff --git a/web/debugger.js b/web/debugger.js index 00f5f6fd4..610a63854 100644 --- a/web/debugger.js +++ b/web/debugger.js @@ -163,29 +163,29 @@ var StepperManager = (function StepperManagerClosure() { enabled: false, active: false, // Stepper specific functions. - create: function create(pageNumber) { + create: function create(pageIndex) { var debug = document.createElement('div'); - debug.id = 'stepper' + pageNumber; + debug.id = 'stepper' + pageIndex; debug.setAttribute('hidden', true); debug.className = 'stepper'; stepperDiv.appendChild(debug); var b = document.createElement('option'); - b.textContent = 'Page ' + (pageNumber + 1); - b.value = pageNumber; + b.textContent = 'Page ' + (pageIndex + 1); + b.value = pageIndex; stepperChooser.appendChild(b); - var initBreakPoints = breakPoints[pageNumber] || []; - var stepper = new Stepper(debug, pageNumber, initBreakPoints); + var initBreakPoints = breakPoints[pageIndex] || []; + var stepper = new Stepper(debug, pageIndex, initBreakPoints); steppers.push(stepper); if (steppers.length === 1) - this.selectStepper(pageNumber, false); + this.selectStepper(pageIndex, false); return stepper; }, - selectStepper: function selectStepper(pageNumber, selectPanel) { + selectStepper: function selectStepper(pageIndex, selectPanel) { if (selectPanel) this.manager.selectPanel(1); for (var i = 0; i < steppers.length; ++i) { var stepper = steppers[i]; - if (stepper.pageNumber == pageNumber) + if (stepper.pageIndex == pageIndex) stepper.panel.removeAttribute('hidden'); else stepper.panel.setAttribute('hidden', true); @@ -193,11 +193,11 @@ var StepperManager = (function StepperManagerClosure() { var options = stepperChooser.options; for (var i = 0; i < options.length; ++i) { var option = options[i]; - option.selected = option.value == pageNumber; + option.selected = option.value == pageIndex; } }, - saveBreakPoints: function saveBreakPoints(pageNumber, bps) { - breakPoints[pageNumber] = bps; + saveBreakPoints: function saveBreakPoints(pageIndex, bps) { + breakPoints[pageIndex] = bps; sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints)); } }; @@ -205,12 +205,12 @@ var StepperManager = (function StepperManagerClosure() { // The stepper for each page's IRQueue. var Stepper = (function StepperClosure() { - function Stepper(panel, pageNumber, initialBreakPoints) { + function Stepper(panel, pageIndex, initialBreakPoints) { this.panel = panel; this.len; this.breakPoint = 0; this.nextBreakPoint = null; - this.pageNumber = pageNumber; + this.pageIndex = pageIndex; this.breakPoints = initialBreakPoints; this.currentIdx = -1; } @@ -256,7 +256,7 @@ var Stepper = (function StepperClosure() { self.breakPoints.push(x); else self.breakPoints.splice(self.breakPoints.indexOf(x), 1); - StepperManager.saveBreakPoints(self.pageNumber, self.breakPoints); + StepperManager.saveBreakPoints(self.pageIndex, self.breakPoints); } })(i); @@ -278,7 +278,7 @@ var Stepper = (function StepperClosure() { return null; }, breakIt: function breakIt(idx, callback) { - StepperManager.selectStepper(this.pageNumber, true); + StepperManager.selectStepper(this.pageIndex, true); var self = this; var dom = document; self.currentIdx = idx;