Add support for async/await, using Babel, and convert some (applicable) code to make use of it

.eslintrc

@@ -1,6 +1,6 @@
 {
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 8,
     "sourceType": "module",
   },
 

external/builder/preprocessor2.js

@@ -288,6 +288,7 @@ function preprocessPDFJSCode(ctx, code) {
     },
   };
   var parseOptions = {
+    ecmaVersion: 8,
     locations: true,
     sourceFile: ctx.sourceFile,
     sourceType: 'module',

gulpfile.js

@@ -177,7 +177,14 @@ function createWebpackConfig(defines, output) {
           exclude: /src[\\\/]core[\\\/](glyphlist|unicode)/,
           options: {
             presets: skipBabel ? undefined : ['env'],
-            plugins: ['transform-es2015-modules-commonjs'],
+            plugins: [
+              'transform-es2015-modules-commonjs',
+              ['transform-runtime', {
+                'helpers': false,
+                'polyfill': false,
+                'regenerator': true,
+              }],
+            ],
           },
         },
         {
@@ -808,7 +815,7 @@ gulp.task('mozcentral', ['mozcentral-pre']);
 gulp.task('chromium-pre', ['buildnumber', 'locale'], function () {
   console.log();
   console.log('### Building Chromium extension');
-  var defines = builder.merge(DEFINES, { CHROME: true, SKIP_BABEL: true, });
+  var defines = builder.merge(DEFINES, { CHROME: true, });
 
   var CHROME_BUILD_DIR = BUILD_DIR + '/chromium/',
       CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + '/content/';
@@ -897,6 +904,11 @@ gulp.task('lib', ['buildnumber'], function () {
       presets: noPreset ? undefined : ['env'],
       plugins: [
         'transform-es2015-modules-commonjs',
+        ['transform-runtime', {
+          'helpers': false,
+          'polyfill': false,
+          'regenerator': true,
+        }],
         babelPluginReplaceNonWebPackRequire,
       ],
     }).code;

package.json

@@ -7,6 +7,7 @@
     "babel-core": "^6.26.3",
     "babel-loader": "^7.1.5",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.7.0",
     "core-js": "^2.5.7",
     "escodegen": "^1.11.0",

src/core/evaluator.js

@@ -131,19 +131,17 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
     this.options = options || DefaultPartialEvaluatorOptions;
     this.pdfFunctionFactory = pdfFunctionFactory;
 
-    this.fetchBuiltInCMap = (name) => {
+    this.fetchBuiltInCMap = async (name) => {
       if (this.builtInCMapCache.has(name)) {
-        return Promise.resolve(this.builtInCMapCache.get(name));
+        return this.builtInCMapCache.get(name);
       }
-      return this.handler.sendWithPromise('FetchBuiltInCMap', {
-        name,
-      }).then((data) => {
-        if (data.compressionType !== CMapCompressionType.NONE) {
-          // Given the size of uncompressed CMaps, only cache compressed ones.
-          this.builtInCMapCache.set(name, data);
-        }
-        return data;
-      });
+      const data = await this.handler.sendWithPromise('FetchBuiltInCMap',
+                                                      { name, });
+      if (data.compressionType !== CMapCompressionType.NONE) {
+        // Given the size of uncompressed CMaps, only cache compressed ones.
+        this.builtInCMapCache.set(name, data);
+      }
+      return data;
     };
   }
 

src/core/obj.js

@@ -1497,29 +1497,23 @@ var XRef = (function XRefClosure() {
       return xrefEntry;
     },
 
-    fetchIfRefAsync: function XRef_fetchIfRefAsync(obj, suppressEncryption) {
+    async fetchIfRefAsync(obj, suppressEncryption) {
       if (!isRef(obj)) {
-        return Promise.resolve(obj);
+        return obj;
       }
       return this.fetchAsync(obj, suppressEncryption);
     },
 
-    fetchAsync: function XRef_fetchAsync(ref, suppressEncryption) {
-      var streamManager = this.stream.manager;
-      var xref = this;
-      return new Promise(function tryFetch(resolve, reject) {
-        try {
-          resolve(xref.fetch(ref, suppressEncryption));
-        } catch (e) {
-          if (e instanceof MissingDataException) {
-            streamManager.requestRange(e.begin, e.end).then(function () {
-              tryFetch(resolve, reject);
-            }, reject);
-            return;
-          }
-          reject(e);
+    async fetchAsync(ref, suppressEncryption) {
+      try {
+        return this.fetch(ref, suppressEncryption);
+      } catch (ex) {
+        if (!(ex instanceof MissingDataException)) {
+          throw ex;
         }
-      });
+        await this.pdfManager.requestRange(ex.begin, ex.end);
+        return this.fetchAsync(ref, suppressEncryption);
+      }
     },
 
     getCatalogObj: function XRef_getCatalogObj() {

src/core/pdf_manager.js

@@ -72,7 +72,7 @@ class BasePdfManager {
     return this.pdfDocument.cleanup();
   }
 
-  ensure(obj, prop, args) {
+  async ensure(obj, prop, args) {
     unreachable('Abstract method `ensure` called');
   }
 
@@ -111,15 +111,12 @@ class LocalPdfManager extends BasePdfManager {
     this._loadedStreamPromise = Promise.resolve(stream);
   }
 
-  ensure(obj, prop, args) {
-    return new Promise(function(resolve) {
-      const value = obj[prop];
-      if (typeof value === 'function') {
-        resolve(value.apply(obj, args));
-      } else {
-        resolve(value);
-      }
-    });
+  async ensure(obj, prop, args) {
+    const value = obj[prop];
+    if (typeof value === 'function') {
+      return value.apply(obj, args);
+    }
+    return value;
   }
 
   requestRange(begin, end) {
@@ -155,30 +152,20 @@ class NetworkPdfManager extends BasePdfManager {
     this.pdfDocument = new PDFDocument(this, this.streamManager.getStream());
   }
 
-  ensure(obj, prop, args) {
-    return new Promise((resolve, reject) => {
-      let ensureHelper = () => {
-        try {
-          const value = obj[prop];
-          let result;
-          if (typeof value === 'function') {
-            result = value.apply(obj, args);
-          } else {
-            result = value;
-          }
-          resolve(result);
-        } catch (ex) {
-          if (!(ex instanceof MissingDataException)) {
-            reject(ex);
-            return;
-          }
-          this.streamManager.requestRange(ex.begin, ex.end)
-            .then(ensureHelper, reject);
-        }
-      };
-
-      ensureHelper();
-    });
+  async ensure(obj, prop, args) {
+    try {
+      const value = obj[prop];
+      if (typeof value === 'function') {
+        return value.apply(obj, args);
+      }
+      return value;
+    } catch (ex) {
+      if (!(ex instanceof MissingDataException)) {
+        throw ex;
+      }
+      await this.requestRange(ex.begin, ex.end);
+      return this.ensure(obj, prop, args);
+    }
   }
 
   requestRange(begin, end) {

src/display/api.js

@@ -2050,13 +2050,11 @@ var WorkerTransport = (function WorkerTransportClosure() {
         });
       }, this);
 
-      messageHandler.on('FetchBuiltInCMap', function (data) {
+      messageHandler.on('FetchBuiltInCMap', function(data) {
         if (this.destroyed) {
           return Promise.reject(new Error('Worker was destroyed'));
         }
-        return this.CMapReaderFactory.fetch({
-          name: data.name,
-        });
+        return this.CMapReaderFactory.fetch(data);
       }, this);
     },