From: Artur Adib <arturadib@gmail.com>
Date: Wed, 2 Nov 2011 15:23:42 +0000 (-0400)
Subject: Merge branch 'refs/heads/master' into text-select
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=49a303f2f2bb875c6836be38139aaf087b7a010a;p=pdf.js.git

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

Conflicts:
	src/core.js
---

49a303f2f2bb875c6836be38139aaf087b7a010a
diff --cc src/core.js
index ab25090,09d6659..98cb456
--- a/src/core.js
+++ b/src/core.js
@@@ -306,10 -306,9 +307,10 @@@ var Page = (function pagePage() 
        }
        return links;
      },
-     startRendering: function(ctx, callback, textLayer)  {
 -    startRendering: function pageStartRendering(ctx, callback)  {
++    startRendering: function pageStartRendering(ctx, callback, textLayer)  {
        this.ctx = ctx;
        this.callback = callback;
 +      this.textLayer = textLayer;
  
        this.startRenderingTime = Date.now();
        this.pdf.startRendering(this);