Merge pull request #8370 from Snuffleupagus/src-rm-bind

Replace unnecessary `bind(this)` and `var self = this` statements with arrow functions in remaining `src/` files

src/display/annotation_layer.js

@@ -312,13 +312,11 @@ var LinkAnnotationElement = (function LinkAnnotationElementClosure() {
      * @param {Object} destination
      * @memberof LinkAnnotationElement
      */
-    _bindLink: function LinkAnnotationElement_bindLink(link, destination) {
+    _bindLink(link, destination) {
-      var self = this;
-
       link.href = this.linkService.getDestinationHash(destination);
-      link.onclick = function() {
+      link.onclick = () => {
         if (destination) {
-          self.linkService.navigateTo(destination);
+          this.linkService.navigateTo(destination);
         }
         return false;
       };
@@ -335,13 +333,10 @@ var LinkAnnotationElement = (function LinkAnnotationElementClosure() {
      * @param {Object} action
      * @memberof LinkAnnotationElement
      */
-    _bindNamedAction:
+    _bindNamedAction(link, action) {
-        function LinkAnnotationElement_bindNamedAction(link, action) {
-      var self = this;
-
       link.href = this.linkService.getAnchorUrl('');
-      link.onclick = function() {
+      link.onclick = () => {
-        self.linkService.executeNamedAction(action);
+        this.linkService.executeNamedAction(action);
         return false;
       };
       link.className = 'internalLink';

src/display/api.js

@@ -369,13 +369,13 @@ var PDFDocumentLoadingTask = (function PDFDocumentLoadingTaskClosure() {
 
       var transportDestroyed = !this._transport ? Promise.resolve() :
         this._transport.destroy();
-      return transportDestroyed.then(function () {
+      return transportDestroyed.then(() => {
         this._transport = null;
         if (this._worker) {
           this._worker.destroy();
           this._worker = null;
         }
-      }.bind(this));
+      });
     },
 
     /**
@@ -436,22 +436,22 @@ var PDFDataRangeTransport = (function pdfDataRangeTransportClosure() {
     },
 
     onDataProgress: function PDFDataRangeTransport_onDataProgress(loaded) {
-      this._readyCapability.promise.then(function () {
+      this._readyCapability.promise.then(() => {
         var listeners = this._progressListeners;
         for (var i = 0, n = listeners.length; i < n; ++i) {
           listeners[i](loaded);
         }
-      }.bind(this));
+      });
     },
 
     onDataProgressiveRead:
         function PDFDataRangeTransport_onDataProgress(chunk) {
-      this._readyCapability.promise.then(function () {
+      this._readyCapability.promise.then(() => {
         var listeners = this._progressiveReadListeners;
         for (var i = 0, n = listeners.length; i < n; ++i) {
           listeners[i](chunk);
         }
-      }.bind(this));
+      });
     },
 
     transportReady: function PDFDataRangeTransport_transportReady() {
@@ -822,6 +822,26 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
         });
       }
 
+      var complete = (error) => {
+        var i = intentState.renderTasks.indexOf(internalRenderTask);
+        if (i >= 0) {
+          intentState.renderTasks.splice(i, 1);
+        }
+
+        if (this.cleanupAfterRender) {
+          this.pendingCleanup = true;
+        }
+        this._tryCleanup();
+
+        if (error) {
+          internalRenderTask.capability.reject(error);
+        } else {
+          internalRenderTask.capability.resolve();
+        }
+        stats.timeEnd('Rendering');
+        stats.timeEnd('Overall');
+      };
+
       var internalRenderTask = new InternalRenderTask(complete, params,
                                                       this.objs,
                                                       this.commonObjs,
@@ -841,41 +861,15 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
         renderTask.onContinue = params.continueCallback;
       }
 
-      var self = this;
+      intentState.displayReadyCapability.promise.then((transparency) => {
-      intentState.displayReadyCapability.promise.then(
+        if (this.pendingCleanup) {
-        function pageDisplayReadyPromise(transparency) {
+          complete();
-          if (self.pendingCleanup) {
+          return;
-            complete();
-            return;
-          }
-          stats.time('Rendering');
-          internalRenderTask.initializeGraphics(transparency);
-          internalRenderTask.operatorListChanged();
-        },
-        function pageDisplayReadPromiseError(reason) {
-          complete(reason);
         }
-      );
+        stats.time('Rendering');
-
+        internalRenderTask.initializeGraphics(transparency);
-      function complete(error) {
+        internalRenderTask.operatorListChanged();
-        var i = intentState.renderTasks.indexOf(internalRenderTask);
+      }, complete);
-        if (i >= 0) {
-          intentState.renderTasks.splice(i, 1);
-        }
-
-        if (self.cleanupAfterRender) {
-          self.pendingCleanup = true;
-        }
-        self._tryCleanup();
-
-        if (error) {
-          internalRenderTask.capability.reject(error);
-        } else {
-          internalRenderTask.capability.resolve();
-        }
-        stats.timeEnd('Rendering');
-        stats.timeEnd('Overall');
-      }
 
       return renderTask;
     },
@@ -1106,11 +1100,11 @@ class LoopbackPort {
 
     var cloned = new WeakMap();
     var e = {data: cloneValue(obj)};
-    this._deferred.then(function () {
+    this._deferred.then(() => {
       this._listeners.forEach(function (listener) {
         listener.call(this, e);
       }, this);
-    }.bind(this));
+    });
   }
 
   addEventListener(name, listener) {
@@ -1267,7 +1261,7 @@ var PDFWorker = (function PDFWorkerClosure() {
           // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
           var worker = new Worker(workerSrc);
           var messageHandler = new MessageHandler('main', 'worker', worker);
-          var terminateEarly = function() {
+          var terminateEarly = () => {
             worker.removeEventListener('error', onWorkerError);
             messageHandler.destroy();
             worker.terminate();
@@ -1278,18 +1272,18 @@ var PDFWorker = (function PDFWorkerClosure() {
               // error (e.g. NetworkError / SecurityError).
               this._setupFakeWorker();
             }
-          }.bind(this);
+          };
 
-          var onWorkerError = function(event) {
+          var onWorkerError = () => {
             if (!this._webWorker) {
               // Worker failed to initialize due to an error. Clean up and fall
               // back to the fake worker.
               terminateEarly();
             }
-          }.bind(this);
+          };
           worker.addEventListener('error', onWorkerError);
 
-          messageHandler.on('test', function PDFWorker_test(data) {
+          messageHandler.on('test', (data) => {
             worker.removeEventListener('error', onWorkerError);
             if (this.destroyed) {
               terminateEarly();
@@ -1313,7 +1307,7 @@ var PDFWorker = (function PDFWorkerClosure() {
               messageHandler.destroy();
               worker.terminate();
             }
-          }.bind(this));
+          });
 
           messageHandler.on('console_log', function (data) {
             console.log.apply(console, data);
@@ -1322,7 +1316,7 @@ var PDFWorker = (function PDFWorkerClosure() {
             console.error.apply(console, data);
           });
 
-          messageHandler.on('ready', function (data) {
+          messageHandler.on('ready', (data) => {
             worker.removeEventListener('error', onWorkerError);
             if (this.destroyed) {
               terminateEarly();
@@ -1334,7 +1328,7 @@ var PDFWorker = (function PDFWorkerClosure() {
               // We need fallback to a faked worker.
               this._setupFakeWorker();
             }
-          }.bind(this));
+          });
 
           var sendTest = function () {
             var postMessageTransfers =
@@ -1373,7 +1367,7 @@ var PDFWorker = (function PDFWorkerClosure() {
         isWorkerDisabled = true;
       }
 
-      setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
+      setupFakeWorkerGlobal().then((WorkerMessageHandler) => {
         if (this.destroyed) {
           this._readyCapability.reject(new Error('Worker was destroyed'));
           return;
@@ -1397,7 +1391,7 @@ var PDFWorker = (function PDFWorkerClosure() {
         var messageHandler = new MessageHandler(id, id + '_worker', port);
         this._messageHandler = messageHandler;
         this._readyCapability.resolve();
-      }.bind(this));
+      });
     },
 
     /**
@@ -1472,21 +1466,20 @@ var WorkerTransport = (function WorkerTransportClosure() {
       });
       this.pageCache = [];
       this.pagePromises = [];
-      var self = this;
       // We also need to wait for the worker to finish its long running tasks.
       var terminated = this.messageHandler.sendWithPromise('Terminate', null);
       waitOn.push(terminated);
-      Promise.all(waitOn).then(function () {
+      Promise.all(waitOn).then(() => {
-        self.fontLoader.clear();
+        this.fontLoader.clear();
-        if (self.pdfDataRangeTransport) {
+        if (this.pdfDataRangeTransport) {
-          self.pdfDataRangeTransport.abort();
+          this.pdfDataRangeTransport.abort();
-          self.pdfDataRangeTransport = null;
+          this.pdfDataRangeTransport = null;
         }
-        if (self.messageHandler) {
+        if (this.messageHandler) {
-          self.messageHandler.destroy();
+          this.messageHandler.destroy();
-          self.messageHandler = null;
+          this.messageHandler = null;
         }
-        self.destroyCapability.resolve();
+        this.destroyCapability.resolve();
       }, this.destroyCapability.reject);
       return this.destroyCapability.promise;
     },
@@ -1641,13 +1634,11 @@ var WorkerTransport = (function WorkerTransportClosure() {
               disableFontFace: getDefaultSetting('disableFontFace'),
               fontRegistry,
             });
+            var fontReady = (fontObjs) => {
+              this.commonObjs.resolve(id, font);
+            };
 
-            this.fontLoader.bind(
+            this.fontLoader.bind([font], fontReady);
-              [font],
-              function fontReady(fontObjs) {
-                this.commonObjs.resolve(id, font);
-              }.bind(this)
-            );
             break;
           case 'FontPath':
             this.commonObjs.resolve(id, data[2]);
@@ -1821,14 +1812,14 @@ var WorkerTransport = (function WorkerTransportClosure() {
       }
       var promise = this.messageHandler.sendWithPromise('GetPage', {
         pageIndex,
-      }).then(function (pageInfo) {
+      }).then((pageInfo) => {
         if (this.destroyed) {
           throw new Error('Transport destroyed');
         }
         var page = new PDFPageProxy(pageIndex, pageInfo, this);
         this.pageCache[pageIndex] = page;
         return page;
-      }.bind(this));
+      });
       this.pagePromises[pageIndex] = promise;
       return promise;
     },
@@ -1889,8 +1880,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
     },
 
     startCleanup: function WorkerTransport_startCleanup() {
-      this.messageHandler.sendWithPromise('Cleanup', null).
+      this.messageHandler.sendWithPromise('Cleanup', null).then(() => {
-        then(function endCleanup() {
         for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
           var page = this.pageCache[i];
           if (page) {
@@ -1899,7 +1889,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
         }
         this.commonObjs.clear();
         this.fontLoader.clear();
-      }.bind(this));
+      });
     }
   };
   return WorkerTransport;

src/display/dom_utils.js

@@ -64,7 +64,7 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
       if (!name) {
         return Promise.reject(new Error('CMap name must be specified.'));
       }
-      return new Promise(function (resolve, reject) {
+      return new Promise((resolve, reject) => {
         var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');
 
         var request = new XMLHttpRequest();
@@ -73,7 +73,7 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
         if (this.isCompressed) {
           request.responseType = 'arraybuffer';
         }
-        request.onreadystatechange = function () {
+        request.onreadystatechange = () => {
           if (request.readyState !== XMLHttpRequest.DONE) {
             return;
           }
@@ -96,10 +96,10 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
           reject(new Error('Unable to load ' +
                            (this.isCompressed ? 'binary ' : '') +
                            'CMap at: ' + url));
-        }.bind(this);
+        };
 
         request.send(null);
-      }.bind(this));
+      });
     },
   };
 

src/display/svg.js

@@ -403,7 +403,6 @@ SVGGraphics = (function SVGGraphicsClosure() {
       var fnArrayLen = fnArray.length;
       var argsArray = operatorList.argsArray;
 
-      var self = this;
       for (var i = 0; i < fnArrayLen; i++) {
         if (OPS.dependency === fnArray[i]) {
           var deps = argsArray[i];
@@ -412,12 +411,12 @@ SVGGraphics = (function SVGGraphicsClosure() {
             var common = obj.substring(0, 2) === 'g_';
             var promise;
             if (common) {
-              promise = new Promise(function(resolve) {
+              promise = new Promise((resolve) => {
-                self.commonObjs.get(obj, resolve);
+                this.commonObjs.get(obj, resolve);
               });
             } else {
-              promise = new Promise(function(resolve) {
+              promise = new Promise((resolve) => {
-                self.objs.get(obj, resolve);
+                this.objs.get(obj, resolve);
               });
             }
             this.current.dependencies.push(promise);
@@ -438,12 +437,12 @@ SVGGraphics = (function SVGGraphicsClosure() {
       this.viewport = viewport;
 
       var svgElement = this._initialize(viewport);
-      return this.loadDependencies(operatorList).then(function () {
+      return this.loadDependencies(operatorList).then(() => {
         this.transformMatrix = IDENTITY_MATRIX;
         var opTree = this.convertOpList(operatorList);
         this.executeOpTree(opTree);
         return svgElement;
-      }.bind(this));
+      });
     },
 
     convertOpList: function SVGGraphics_convertOpList(operatorList) {

src/display/text_layer.js

@@ -537,10 +537,9 @@ var renderTextLayer = (function renderTextLayerClosure() {
       if (!timeout) { // Render right away
         render(this);
       } else { // Schedule
-        var self = this;
+        this._renderTimer = setTimeout(() => {
-        this._renderTimer = setTimeout(function() {
+          render(this);
-          render(self);
+          this._renderTimer = null;
-          self._renderTimer = null;
         }, timeout);
       }
     },

src/shared/compatibility.js

@@ -1000,7 +1000,7 @@ PDFJS.compatibilityChecked = true;
         return;
       }
       this.pendingRejectionCheck = true;
-      setTimeout(function rejectionCheck() {
+      setTimeout(() => {
         this.pendingRejectionCheck = false;
         var now = Date.now();
         for (var i = 0; i < this.unhandledRejections.length; i++) {
@@ -1023,7 +1023,7 @@ PDFJS.compatibilityChecked = true;
         if (this.unhandledRejections.length) {
           this.scheduleRejectionCheck();
         }
-      }.bind(this), REJECTION_TIMEOUT);
+      }, REJECTION_TIMEOUT);
     }
   };
 

src/shared/util.js

@@ -1227,7 +1227,7 @@ function MessageHandler(sourceName, targetName, comObj) {
   var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
   var ah = this.actionHandler = Object.create(null);
 
-  this._onComObjOnMessage = function messageHandlerComObjOnMessage(event) {
+  this._onComObjOnMessage = (event) => {
     var data = event.data;
     if (data.targetName !== this.sourceName) {
       return;
@@ -1279,7 +1279,7 @@ function MessageHandler(sourceName, targetName, comObj) {
     } else {
       error('Unknown action from worker: ' + data.action);
     }
-  }.bind(this);
+  };
   comObj.addEventListener('message', this._onComObjOnMessage);
 }