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,11 +96,8 @@ 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) {
-
-  LocalPdfManager.prototype.ensure =
-      function LocalPdfManager_ensure(obj, prop, args) {
       return new Promise(function (resolve, reject) {
         try {
           var value = obj[prop];
@@ -116,26 +112,24 @@ var LocalPdfManager = (function LocalPdfManagerClosure() {
           reject(e);
         }
       });
-  };
+    },
 
-  LocalPdfManager.prototype.requestRange =
+    requestRange: function LocalPdfManager_requestRange(begin, end) {
-      function LocalPdfManager_requestRange(begin, end) {
       return Promise.resolve();
-  };
+    },
 
-  LocalPdfManager.prototype.requestLoadedStream =
+    requestLoadedStream: function LocalPdfManager_requestLoadedStream() {
-      function LocalPdfManager_requestLoadedStream() {
-  };
-
-  LocalPdfManager.prototype.onLoadedStream =
-      function LocalPdfManager_getLoadedStream() {
-    return this._loadedStreamCapability.promise;
-  };
-
-  LocalPdfManager.prototype.terminate =
-      function LocalPdfManager_terminate() {
       return;
-  };
+    },
+
+    onLoadedStream: function LocalPdfManager_onLoadedStream() {
+      return this._loadedStreamCapability.promise;
+    },
+
+    terminate: function LocalPdfManager_terminate() {
+      return;
+    }
+  });
 
   return LocalPdfManager;
 })();
@@ -156,16 +150,12 @@ 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);
   }
 
-  NetworkPdfManager.prototype = Object.create(BasePdfManager.prototype);
+  Util.inherit(NetworkPdfManager, BasePdfManager, {
-  NetworkPdfManager.prototype.constructor = NetworkPdfManager;
+    ensure: function NetworkPdfManager_ensure(obj, prop, args) {
-
-  NetworkPdfManager.prototype.ensure =
-      function NetworkPdfManager_ensure(obj, prop, args) {
       var pdfManager = this;
 
       return new Promise(function (resolve, reject) {
@@ -191,32 +181,29 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() {
 
         ensureHelper();
       });
-  };
+    },
 
-  NetworkPdfManager.prototype.requestRange =
+    requestRange: function NetworkPdfManager_requestRange(begin, end) {
-      function NetworkPdfManager_requestRange(begin, end) {
       return this.streamManager.requestRange(begin, end);
-  };
+    },
 
-  NetworkPdfManager.prototype.requestLoadedStream =
+    requestLoadedStream: function NetworkPdfManager_requestLoadedStream() {
-      function NetworkPdfManager_requestLoadedStream() {
       this.streamManager.requestAllChunks();
-  };
+    },
 
-  NetworkPdfManager.prototype.sendProgressiveData =
+    sendProgressiveData:
         function NetworkPdfManager_sendProgressiveData(chunk) {
       this.streamManager.onReceiveData({ chunk: chunk });
-  };
+    },
 
-  NetworkPdfManager.prototype.onLoadedStream =
+    onLoadedStream: function NetworkPdfManager_onLoadedStream() {
-      function NetworkPdfManager_getLoadedStream() {
       return this.streamManager.onLoadedStream();
-  };
+    },
 
-  NetworkPdfManager.prototype.terminate =
+    terminate: function NetworkPdfManager_terminate() {
-      function NetworkPdfManager_terminate() {
       this.streamManager.abort();
-  };
+    }
+  });
 
   return NetworkPdfManager;
 })();