From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 12 Apr 2012 21:11:22 +0000 (-0700)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c02b18b5e8040d75119a09f3790d2c4f3d6761d7;p=pdf.js.git

Merge upstream.
---

c02b18b5e8040d75119a09f3790d2c4f3d6761d7
diff --cc src/api.js
index 841f3fe,b14ea13..05e8a95
--- a/src/api.js
+++ b/src/api.js
@@@ -79,7 -79,8 +79,8 @@@ var PDFPageProxy = (function PDFPagePro
    function PDFPageProxy(pageInfo, transport) {
      this.pageInfo = pageInfo;
      this.transport = transport;
 -    this._stats = new StatTimer();
 -    this._stats.enabled = !!globalScope.PDFJS.enableStats;
 +    this.stats = new StatTimer();
++    this.stats.enabled = !!globalScope.PDFJS.enableStats;
      this.objs = transport.objs;
    }
    PDFPageProxy.prototype = {