Merge mozilla-central to autoland. a=merge

iaxat · Feb 20, 2019 · 685fe7b · 685fe7b
2 parents 75256d0 + 8e2d3cc
commit 685fe7b
Show file tree

Hide file tree

Showing 190 changed files with 3,458 additions and 2,808 deletions.
diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta
@@ -1,4 +1,4 @@
-export MOZ_PGO=1
+. "$topsrcdir/build/mozconfig.pgo"
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 

diff --git a/browser/config/mozconfigs/linux64/release b/browser/config/mozconfigs/linux64/release
@@ -1,7 +1,7 @@
 # This make file should be identical to the beta mozconfig, apart from the
 # safeguard below
 
-export MOZ_PGO=1
+. "$topsrcdir/build/mozconfig.pgo"
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 

diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist
@@ -42,7 +42,7 @@ whitelist['release']['linux32'] += [
 whitelist['release']['linux64'] += [
     'export MOZILLA_OFFICIAL=1',
     'export MOZ_TELEMETRY_REPORTING=1',
-    'export MOZ_PGO=1',
+    '. "$topsrcdir/build/mozconfig.pgo"',
 ]
 
 if __name__ == '__main__':

diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt
@@ -5,7 +5,6 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
 
 if [ -f /c/builds/gapi.data ]; then
   _gapi_keyfile=c:/builds/gapi.data

diff --git a/browser/config/mozconfigs/win64-aarch64/common-opt b/browser/config/mozconfigs/win64-aarch64/common-opt
@@ -5,7 +5,7 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
+
 if [ -f /c/builds/gapi.data ]; then
   _gapi_keyfile=c:/builds/gapi.data
 else

diff --git a/browser/config/mozconfigs/win64/common-opt b/browser/config/mozconfigs/win64/common-opt
@@ -5,7 +5,7 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
+
 if [ -f /c/builds/gapi.data ]; then
   _gapi_keyfile=c:/builds/gapi.data
 else

diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
@@ -1,5 +1,5 @@
 This is the PDF.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 2.1.266
+Current extension version is: 2.2.15
 
-Taken from upstream commit: 81f5835c
+Taken from upstream commit: ece6a31a
diff --git a/browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm b/browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm
@@ -22,25 +22,25 @@
 "use strict";
 var EXPORTED_SYMBOLS = ["PdfJsDefaultPreferences"];
 var PdfJsDefaultPreferences = Object.freeze({
- "viewOnLoad": 0,
- "defaultZoomValue": "",
- "sidebarViewOnLoad": -1,
  "cursorToolOnLoad": 0,
+ "defaultZoomValue": "",
+ "disablePageLabels": false,
+ "enablePrintAutoRotate": false,
  "enableWebGL": false,
  "eventBusDispatchToDOM": false,
- "pdfBugEnabled": false,
- "disableRange": false,
- "disableStream": false,
- "disableAutoFetch": false,
- "disableFontFace": false,
- "textLayerMode": 1,
- "useOnlyCssZoom": false,
  "externalLinkTarget": 0,
+ "historyUpdateUrl": false,
+ "pdfBugEnabled": false,
  "renderer": "canvas",
  "renderInteractiveForms": false,
- "enablePrintAutoRotate": false,
- "disablePageLabels": false,
- "historyUpdateUrl": false,
+ "sidebarViewOnLoad": -1,
  "scrollModeOnLoad": -1,
- "spreadModeOnLoad": -1
+ "spreadModeOnLoad": -1,
+ "textLayerMode": 1,
+ "useOnlyCssZoom": false,
+ "viewOnLoad": 0,
+ "disableAutoFetch": false,
+ "disableFontFace": false,
+ "disableRange": false,
+ "disableStream": false
 });
diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/browser/extensions/pdfjs/content/build/pdf.js
@@ -123,8 +123,8 @@ return /******/ (function(modules) { // webpackBootstrap
 "use strict";
 
 
-var pdfjsVersion = '2.1.266';
-var pdfjsBuild = '81f5835c';
+var pdfjsVersion = '2.2.15';
+var pdfjsBuild = 'ece6a31a';
 
 var pdfjsSharedUtil = __w_pdfjs_require__(1);
 
@@ -1411,7 +1411,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
 
   return worker.messageHandler.sendWithPromise('GetDocRequest', {
     docId,
-    apiVersion: '2.1.266',
+    apiVersion: '2.2.15',
     source: {
       data: source.data,
       url: source.url,
@@ -3148,9 +3148,9 @@ const InternalRenderTask = function InternalRenderTaskClosure() {
   return InternalRenderTask;
 }();
 
-const version = '2.1.266';
+const version = '2.2.15';
 exports.version = version;
-const build = '81f5835c';
+const build = 'ece6a31a';
 exports.build = build;
 
 /***/ }),

diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js
@@ -123,8 +123,8 @@ return /******/ (function(modules) { // webpackBootstrap
 "use strict";
 
 
-const pdfjsVersion = '2.1.266';
-const pdfjsBuild = '81f5835c';
+const pdfjsVersion = '2.2.15';
+const pdfjsBuild = 'ece6a31a';
 
 const pdfjsCoreWorker = __w_pdfjs_require__(1);
 
@@ -375,7 +375,7 @@ var WorkerMessageHandler = {
     var cancelXHRs = null;
     var WorkerTasks = [];
     let apiVersion = docParams.apiVersion;
-    let workerVersion = '2.1.266';
+    let workerVersion = '2.2.15';
 
     if (apiVersion !== workerVersion) {
       throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
@@ -3007,7 +3007,7 @@ class PDFDocument {
         this.xfa = this.acroForm.get('XFA');
         const fields = this.acroForm.get('Fields');
 
-        if ((!fields || !Array.isArray(fields) || fields.length === 0) && !this.xfa) {
+        if ((!Array.isArray(fields) || fields.length === 0) && !this.xfa) {
           this.acroForm = null;
         }
       }
@@ -3019,6 +3019,20 @@ class PDFDocument {
       (0, _util.info)('Cannot fetch AcroForm entry; assuming no AcroForms are present');
       this.acroForm = null;
     }
+
+    try {
+      const collection = this.catalog.catDict.get('Collection');
+
+      if ((0, _primitives.isDict)(collection) && collection.getKeys().length > 0) {
+        this.collection = collection;
+      }
+    } catch (ex) {
+      if (ex instanceof _util.MissingDataException) {
+        throw ex;
+      }
+
+      (0, _util.info)('Cannot fetch Collection dictionary.');
+    }
   }
 
   get linearization() {
@@ -3147,7 +3161,8 @@ class PDFDocument {
       PDFFormatVersion: this.pdfFormatVersion,
       IsLinearized: !!this.linearization,
       IsAcroFormPresent: !!this.acroForm,
-      IsXFAPresent: !!this.xfa
+      IsXFAPresent: !!this.xfa,
+      IsCollectionPresent: !!this.collection
     };
     let infoDict;