Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui

Conflicts:
	src/canvas.js

diff --cc src/canvas.js
index a1c4fb40cd1f437a07a7e33170f7c48456ffef04,4797bab461eda8ed7328c4096e8f3c346a690a40..3fd55b45d04fa1c1279e8e2972d33294b8cdb81c
--- 1/src/canvas.js
--- 2/src/canvas.js
+++ b/src/canvas.js
@@@ -255,9 -255,10 +255,11 @@@ var CanvasGraphics = (function CanvasGr
        }
        // Scale so that canvas units are the same as PDF user space units
        this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
 -      this.textDivs = [];
 -      this.textLayerQueue = [];
+       // Move the media left-top corner to the (0,0) canvas position
+       this.ctx.translate(-mediaBox.x, -mediaBox.y);
 +
 +      if (this.textLayer)
 +        this.textLayer.beginLayout();
      },
  
      executeIRQueue: function canvasGraphicsExecuteIRQueue(codeIR,

diff --cc web/viewer.js
Simple merge