From: Artur Adib <arturadib@gmail.com>
Date: Tue, 8 Nov 2011 13:56:52 +0000 (-0500)
Subject: Merge branch 'refs/heads/master' into text-select
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=46a48a56b74f9dd488965f6ff4ea20acc4ae8f55;p=pdf.js.git

Merge branch 'refs/heads/master' into text-select

Conflicts:
	src/core.js
---

46a48a56b74f9dd488965f6ff4ea20acc4ae8f55
diff --cc src/core.js
index 98cb456,5e97763..6308f17
--- a/src/core.js
+++ b/src/core.js
@@@ -157,8 -160,7 +160,7 @@@ var Page = (function pagePage() 
                                                  IRQueue, fonts) {
        var self = this;
        this.IRQueue = IRQueue;
 -      var gfx = new CanvasGraphics(this.ctx, this.objs);
 +      var gfx = new CanvasGraphics(this.ctx, this.objs, this.textLayer);
-       var startTime = Date.now();
  
        var displayContinuation = function pageDisplayContinuation() {
          // Always defer call to display() to work around bug in