diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
index 24513981a94f9..9a94b248e5f1d 100644
--- 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.0.491
+Current extension version is: 2.0.506
-Taken from upstream commit: 2dc4af52
+Taken from upstream commit: b7a3a5e7
diff --git a/browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm b/browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm
index a5b5744d1f5ed..111b957ed64e3 100644
--- a/browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm
+++ b/browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm
@@ -37,5 +37,7 @@ var PdfJsDefaultPreferences = Object.freeze({
"renderInteractiveForms": false,
"enablePrintAutoRotate": false,
"disablePageMode": false,
- "disablePageLabels": false
+ "disablePageLabels": false,
+ "scrollModeOnLoad": 0,
+ "spreadModeOnLoad": 0
});
diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/browser/extensions/pdfjs/content/build/pdf.js
index 5021574500592..bce26136246ca 100644
--- a/browser/extensions/pdfjs/content/build/pdf.js
+++ b/browser/extensions/pdfjs/content/build/pdf.js
@@ -1650,8 +1650,8 @@ exports.GlobalWorkerOptions = GlobalWorkerOptions;
"use strict";
-var pdfjsVersion = '2.0.491';
-var pdfjsBuild = '2dc4af52';
+var pdfjsVersion = '2.0.506';
+var pdfjsBuild = 'b7a3a5e7';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayAPI = __w_pdfjs_require__(9);
var pdfjsDisplayTextLayer = __w_pdfjs_require__(17);
@@ -4929,7 +4929,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
}
return worker.messageHandler.sendWithPromise('GetDocRequest', {
docId,
- apiVersion: '2.0.491',
+ apiVersion: '2.0.506',
source: {
data: source.data,
url: source.url,
@@ -6252,8 +6252,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}();
var version, build;
{
- exports.version = version = '2.0.491';
- exports.build = build = '2dc4af52';
+ exports.version = version = '2.0.506';
+ exports.build = build = 'b7a3a5e7';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js
index c7074a0789569..949bb48449a4a 100644
--- a/browser/extensions/pdfjs/content/build/pdf.worker.js
+++ b/browser/extensions/pdfjs/content/build/pdf.worker.js
@@ -21103,8 +21103,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
"use strict";
-var pdfjsVersion = '2.0.491';
-var pdfjsBuild = '2dc4af52';
+var pdfjsVersion = '2.0.506';
+var pdfjsBuild = 'b7a3a5e7';
var pdfjsCoreWorker = __w_pdfjs_require__(20);
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
@@ -21305,7 +21305,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
let apiVersion = docParams.apiVersion;
- let workerVersion = '2.0.491';
+ let workerVersion = '2.0.506';
if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
}
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal.png
new file mode 100644
index 0000000000000..cb702fc4d1114
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal@2x.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal@2x.png
new file mode 100644
index 0000000000000..7f05289bb157e
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal@2x.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical.png
new file mode 100644
index 0000000000000..0b8427a16c0f3
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical@2x.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical@2x.png
new file mode 100644
index 0000000000000..72ab55ebf270e
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical@2x.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped.png
new file mode 100644
index 0000000000000..165fc8bc01381
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped@2x.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped@2x.png
new file mode 100644
index 0000000000000..4246141192214
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped@2x.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven.png
new file mode 100644
index 0000000000000..3fa07e703eaa5
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven@2x.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven@2x.png
new file mode 100644
index 0000000000000..32e5033d7db1b
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven@2x.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone.png
new file mode 100644
index 0000000000000..161147354c938
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone@2x.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone@2x.png
new file mode 100644
index 0000000000000..8e51cf3b7d6eb
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone@2x.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd.png
new file mode 100644
index 0000000000000..5126313a1dee1
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd@2x.png b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd@2x.png
new file mode 100644
index 0000000000000..5996b74db1e0c
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd@2x.png differ
diff --git a/browser/extensions/pdfjs/content/web/viewer.css b/browser/extensions/pdfjs/content/web/viewer.css
index 4efc835693614..a95657b95d181 100644
--- a/browser/extensions/pdfjs/content/web/viewer.css
+++ b/browser/extensions/pdfjs/content/web/viewer.css
@@ -290,6 +290,46 @@
border: none;
}
+.pdfViewer.scrollHorizontal, .pdfViewer.scrollWrapped, .spread {
+ margin-left: 3.5px;
+ margin-right: 3.5px;
+ text-align: center;
+}
+
+.pdfViewer.scrollHorizontal, .spread {
+ white-space: nowrap;
+}
+
+.pdfViewer.removePageBorders,
+.pdfViewer.scrollHorizontal .spread,
+.pdfViewer.scrollWrapped .spread {
+ margin-left: 0;
+ margin-right: 0;
+}
+
+.spread .page,
+.pdfViewer.scrollHorizontal .page,
+.pdfViewer.scrollWrapped .page,
+.pdfViewer.scrollHorizontal .spread,
+.pdfViewer.scrollWrapped .spread {
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.spread .page,
+.pdfViewer.scrollHorizontal .page,
+.pdfViewer.scrollWrapped .page {
+ margin-left: -3.5px;
+ margin-right: -3.5px;
+}
+
+.pdfViewer.removePageBorders .spread .page,
+.pdfViewer.removePageBorders.scrollHorizontal .page,
+.pdfViewer.removePageBorders.scrollWrapped .page {
+ margin-left: 5px;
+ margin-right: 5px;
+}
+
.pdfViewer .page canvas {
margin: 0;
display: block;
@@ -309,6 +349,22 @@
background: url('images/loading-icon.gif') center no-repeat;
}
+.pdfPresentationMode .pdfViewer {
+ margin-left: 0;
+ margin-right: 0;
+}
+
+.pdfPresentationMode .pdfViewer .page,
+.pdfPresentationMode .pdfViewer .spread {
+ display: block;
+}
+
+.pdfPresentationMode .pdfViewer .page,
+.pdfPresentationMode .pdfViewer.removePageBorders .page {
+ margin-left: auto;
+ margin-right: auto;
+}
+
.pdfPresentationMode:-moz-full-screen .pdfViewer .page {
margin-bottom: 100%;
border: 0;
@@ -1279,6 +1335,30 @@ html[dir="rtl"] .secondaryToolbarButton > span {
content: url(images/secondaryToolbarButton-handTool.png);
}
+.secondaryToolbarButton.scrollVertical::before {
+ content: url(images/secondaryToolbarButton-scrollVertical.png);
+}
+
+.secondaryToolbarButton.scrollHorizontal::before {
+ content: url(images/secondaryToolbarButton-scrollHorizontal.png);
+}
+
+.secondaryToolbarButton.scrollWrapped::before {
+ content: url(images/secondaryToolbarButton-scrollWrapped.png);
+}
+
+.secondaryToolbarButton.spreadNone::before {
+ content: url(images/secondaryToolbarButton-spreadNone.png);
+}
+
+.secondaryToolbarButton.spreadOdd::before {
+ content: url(images/secondaryToolbarButton-spreadOdd.png);
+}
+
+.secondaryToolbarButton.spreadEven::before {
+ content: url(images/secondaryToolbarButton-spreadEven.png);
+}
+
.secondaryToolbarButton.documentProperties::before {
content: url(images/secondaryToolbarButton-documentProperties.png);
}
@@ -1996,6 +2076,30 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
content: url(images/secondaryToolbarButton-handTool@2x.png);
}
+ .secondaryToolbarButton.scrollVertical::before {
+ content: url(images/secondaryToolbarButton-scrollVertical@2x.png);
+ }
+
+ .secondaryToolbarButton.scrollHorizontal::before {
+ content: url(images/secondaryToolbarButton-scrollHorizontal@2x.png);
+ }
+
+ .secondaryToolbarButton.scrollWrapped::before {
+ content: url(images/secondaryToolbarButton-scrollWrapped@2x.png);
+ }
+
+ .secondaryToolbarButton.spreadNone::before {
+ content: url(images/secondaryToolbarButton-spreadNone@2x.png);
+ }
+
+ .secondaryToolbarButton.spreadOdd::before {
+ content: url(images/secondaryToolbarButton-spreadOdd@2x.png);
+ }
+
+ .secondaryToolbarButton.spreadEven::before {
+ content: url(images/secondaryToolbarButton-spreadEven@2x.png);
+ }
+
.secondaryToolbarButton.documentProperties::before {
content: url(images/secondaryToolbarButton-documentProperties@2x.png);
}
diff --git a/browser/extensions/pdfjs/content/web/viewer.html b/browser/extensions/pdfjs/content/web/viewer.html
index 3939b0b4ec030..218e80dd16948 100644
--- a/browser/extensions/pdfjs/content/web/viewer.html
+++ b/browser/extensions/pdfjs/content/web/viewer.html
@@ -146,7 +146,31 @@
-