Make use of Util.inherit in src/core/pdf_manager.js

While we are here, fix some incorrect function names.

src/core/pdf_manager.js

@@ -13,11 +13,10 @@
  * limitations under the License.
  */
 /* globals NotImplementedException, MissingDataException, Promise, Stream,
-           PDFDocument, ChunkedStreamManager, createPromiseCapability */
+           PDFDocument, ChunkedStreamManager, createPromiseCapability, Util */
 
 'use strict';
 
-// TODO(mack): Make use of PDFJS.Util.inherit() when it becomes available
 var BasePdfManager = (function BasePdfManagerClosure() {
   function BasePdfManager() {
     throw new Error('Cannot initialize BaseManagerManager');
@@ -44,7 +43,7 @@ var BasePdfManager = (function BasePdfManagerClosure() {
       return this.ensure(this.pdfDocument.catalog, prop, args);
     },
 
-    getPage: function BasePdfManager_pagePage(pageIndex) {
+    getPage: function BasePdfManager_getPage(pageIndex) {
       return this.pdfDocument.getPage(pageIndex);
     },
 
@@ -56,7 +55,7 @@ var BasePdfManager = (function BasePdfManagerClosure() {
       return new NotImplementedException();
     },
 
-    requestRange: function BasePdfManager_ensure(begin, end) {
+    requestRange: function BasePdfManager_requestRange(begin, end) {
       return new NotImplementedException();
     },
 
@@ -97,45 +96,40 @@ var LocalPdfManager = (function LocalPdfManagerClosure() {
     this._loadedStreamCapability.resolve(stream);
   }
 
-  LocalPdfManager.prototype = Object.create(BasePdfManager.prototype);
+  Util.inherit(LocalPdfManager, BasePdfManager, {
-  LocalPdfManager.prototype.constructor = LocalPdfManager;
+    ensure: function LocalPdfManager_ensure(obj, prop, args) {
-
+      return new Promise(function (resolve, reject) {
-  LocalPdfManager.prototype.ensure =
+        try {
-      function LocalPdfManager_ensure(obj, prop, args) {
+          var value = obj[prop];
-    return new Promise(function (resolve, reject) {
+          var result;
-      try {
+          if (typeof value === 'function') {
-        var value = obj[prop];
+            result = value.apply(obj, args);
-        var result;
+          } else {
-        if (typeof value === 'function') {
+            result = value;
-          result = value.apply(obj, args);
+          }
-        } else {
+          resolve(result);
-          result = value;
+        } catch (e) {
+          reject(e);
         }
-        resolve(result);
+      });
-      } catch (e) {
+    },
-        reject(e);
-      }
-    });
-  };
 
-  LocalPdfManager.prototype.requestRange =
+    requestRange: function LocalPdfManager_requestRange(begin, end) {
-      function LocalPdfManager_requestRange(begin, end) {
+      return Promise.resolve();
-    return Promise.resolve();
+    },
-  };
 
-  LocalPdfManager.prototype.requestLoadedStream =
+    requestLoadedStream: function LocalPdfManager_requestLoadedStream() {
-      function LocalPdfManager_requestLoadedStream() {
+      return;
-  };
+    },
 
-  LocalPdfManager.prototype.onLoadedStream =
+    onLoadedStream: function LocalPdfManager_onLoadedStream() {
-      function LocalPdfManager_getLoadedStream() {
+      return this._loadedStreamCapability.promise;
-    return this._loadedStreamCapability.promise;
+    },
-  };
 
-  LocalPdfManager.prototype.terminate =
+    terminate: function LocalPdfManager_terminate() {
-      function LocalPdfManager_terminate() {
+      return;
-    return;
+    }
-  };
+  });
 
   return LocalPdfManager;
 })();
@@ -156,67 +150,60 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() {
     this.streamManager = new ChunkedStreamManager(args.length,
                                                   args.rangeChunkSize,
                                                   args.url, params);
-
     this.pdfDocument = new PDFDocument(this, this.streamManager.getStream(),
-                                    args.password);
+                                       args.password);
   }
 
-  NetworkPdfManager.prototype = Object.create(BasePdfManager.prototype);
+  Util.inherit(NetworkPdfManager, BasePdfManager, {
-  NetworkPdfManager.prototype.constructor = NetworkPdfManager;
+    ensure: function NetworkPdfManager_ensure(obj, prop, args) {
+      var pdfManager = this;
 
-  NetworkPdfManager.prototype.ensure =
+      return new Promise(function (resolve, reject) {
-      function NetworkPdfManager_ensure(obj, prop, args) {
+        function ensureHelper() {
-    var pdfManager = this;
+          try {
-
+            var result;
-    return new Promise(function (resolve, reject) {
+            var value = obj[prop];
-      function ensureHelper() {
+            if (typeof value === 'function') {
-        try {
+              result = value.apply(obj, args);
-          var result;
+            } else {
-          var value = obj[prop];
+              result = value;
-          if (typeof value === 'function') {
+            }
-            result = value.apply(obj, args);
+            resolve(result);
-          } else {
+          } catch(e) {
-            result = value;
+            if (!(e instanceof MissingDataException)) {
+              reject(e);
+              return;
+            }
+            pdfManager.streamManager.requestRange(e.begin, e.end).
+              then(ensureHelper, reject);
           }
-          resolve(result);
-        } catch(e) {
-          if (!(e instanceof MissingDataException)) {
-            reject(e);
-            return;
-          }
-          pdfManager.streamManager.requestRange(e.begin, e.end).
-            then(ensureHelper, reject);
         }
-      }
 
-      ensureHelper();
+        ensureHelper();
-    });
+      });
-  };
+    },
 
-  NetworkPdfManager.prototype.requestRange =
+    requestRange: function NetworkPdfManager_requestRange(begin, end) {
-      function NetworkPdfManager_requestRange(begin, end) {
+      return this.streamManager.requestRange(begin, end);
-    return this.streamManager.requestRange(begin, end);
+    },
-  };
 
-  NetworkPdfManager.prototype.requestLoadedStream =
+    requestLoadedStream: function NetworkPdfManager_requestLoadedStream() {
-      function NetworkPdfManager_requestLoadedStream() {
+      this.streamManager.requestAllChunks();
-    this.streamManager.requestAllChunks();
+    },
-  };
 
-  NetworkPdfManager.prototype.sendProgressiveData =
+    sendProgressiveData:
-      function NetworkPdfManager_sendProgressiveData(chunk) {
+        function NetworkPdfManager_sendProgressiveData(chunk) {
-    this.streamManager.onReceiveData({ chunk: chunk });
+      this.streamManager.onReceiveData({ chunk: chunk });
-  };
+    },
 
-  NetworkPdfManager.prototype.onLoadedStream =
+    onLoadedStream: function NetworkPdfManager_onLoadedStream() {
-      function NetworkPdfManager_getLoadedStream() {
+      return this.streamManager.onLoadedStream();
-    return this.streamManager.onLoadedStream();
+    },
-  };
 
-  NetworkPdfManager.prototype.terminate =
+    terminate: function NetworkPdfManager_terminate() {
-      function NetworkPdfManager_terminate() {
+      this.streamManager.abort();
-    this.streamManager.abort();
+    }
-  };
+  });
 
   return NetworkPdfManager;
 })();