Merge branch 'refs/heads/master' into textsearch

Conflicts:
	web/viewer.css
	web/viewer.html
	web/viewer.js

src/api.js

@@ -45,7 +45,7 @@ PDFJS.getDocument = function getDocument(source) {
  * Proxy to a PDFDocument in the worker thread. Also, contains commonly used
  * properties that can be read synchronously.
  */
-var PDFDocumentProxy = (function() {
+var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
   function PDFDocumentProxy(pdfInfo, transport) {
     this.pdfInfo = pdfInfo;
     this.transport = transport;
@@ -69,14 +69,14 @@ var PDFDocumentProxy = (function() {
      * @return {Promise} A promise that is resolved with a {PDFPageProxy}
      * object.
      */
-    getPage: function(number) {
+    getPage: function PDFDocumentProxy_getPage(number) {
       return this.transport.getPage(number);
     },
     /**
      * @return {Promise} A promise that is resolved with a lookup table for
      * mapping named destinations to reference numbers.
      */
-    getDestinations: function() {
+    getDestinations: function PDFDocumentProxy_getDestinations() {
       var promise = new PDFJS.Promise();
       var destinations = this.pdfInfo.destinations;
       promise.resolve(destinations);
@@ -97,7 +97,7 @@ var PDFDocumentProxy = (function() {
      *  ...
      * ].
      */
-    getOutline: function() {
+    getOutline: function PDFDocumentProxy_getOutline() {
       var promise = new PDFJS.Promise();
       var outline = this.pdfInfo.outline;
       promise.resolve(outline);
@@ -109,7 +109,7 @@ var PDFDocumentProxy = (function() {
      * available in the information dictionary and similarly metadata is a
      * {Metadata} object with information from the metadata section of the PDF.
      */
-    getMetadata: function() {
+    getMetadata: function PDFDocumentProxy_getMetadata() {
       var promise = new PDFJS.Promise();
       var info = this.pdfInfo.info;
       var metadata = this.pdfInfo.metadata;
@@ -119,7 +119,7 @@ var PDFDocumentProxy = (function() {
       });
       return promise;
     },
-    destroy: function() {
+    destroy: function PDFDocumentProxy_destroy() {
       this.transport.destroy();
     }
   };
@@ -169,7 +169,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {PageViewport} Contains 'width' and 'height' properties along
      * with transforms required for rendering.
      */
-    getViewport: function(scale, rotate) {
+    getViewport: function PDFPageProxy_getViewport(scale, rotate) {
       if (arguments.length < 2)
         rotate = this.rotate;
       return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
@@ -178,7 +178,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {Promise} A promise that is resolved with an {array} of the
      * annotation objects.
      */
-    getAnnotations: function() {
+    getAnnotations: function PDFPageProxy_getAnnotations() {
       if (this.annotationsPromise)
         return this.annotationsPromise;
 
@@ -198,7 +198,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {Promise} A promise that is resolved when the page finishes
      * rendering.
      */
-    render: function(params) {
+    render: function PDFPageProxy_render(params) {
       this.renderInProgress = true;
 
       var promise = new Promise();
@@ -257,8 +257,8 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * For internal use only.
      */
     startRenderingFromOperatorList:
-      function PDFPageWrapper_startRenderingFromOperatorList(operatorList,
-                                                             fonts) {
+      function PDFPageProxy_startRenderingFromOperatorList(operatorList,
+                                                           fonts) {
       var self = this;
       this.operatorList = operatorList;
 
@@ -279,7 +279,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * For internal use only.
      */
-    ensureFonts: function PDFPageWrapper_ensureFonts(fonts, callback) {
+    ensureFonts: function PDFPageProxy_ensureFonts(fonts, callback) {
       this.stats.time('Font Loading');
       // Convert the font names to the corresponding font obj.
       for (var i = 0, ii = fonts.length; i < ii; i++) {
@@ -299,7 +299,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * For internal use only.
      */
-    display: function PDFPageWrapper_display(gfx, viewport, callback) {
+    display: function PDFPageProxy_display(gfx, viewport, callback) {
       var stats = this.stats;
       stats.time('Rendering');
 
@@ -332,7 +332,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {Promise} That is resolved with the a {string} that is the text
      * content from the page.
      */
-    getTextContent: function() {
+    getTextContent: function PDFPageProxy_getTextContent() {
       var promise = new PDFJS.Promise();
       this.transport.messageHandler.send('GetTextContent', {
           pageIndex: this.pageNumber - 1
@@ -346,7 +346,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * Stub for future feature.
      */
-    getOperationList: function() {
+    getOperationList: function PDFPageProxy_getOperationList() {
       var promise = new PDFJS.Promise();
       var operationList = { // not implemented
         dependencyFontsID: null,
@@ -358,7 +358,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * Destroys resources allocated by the page.
      */
-    destroy: function() {
+    destroy: function PDFPageProxy_destroy() {
       this.destroyed = true;
 
       if (!this.renderInProgress) {