Skip to content

Commit

Permalink
Merge mozilla-central to autoland. a=merge on a CLOSED TREE
Browse files Browse the repository at this point in the history
AndreeaPavel committed May 21, 2018

Verified

This commit was signed with the committer’s verified signature.
spencergibb Spencer Gibb
2 parents 13a006d + 03aa669 commit 8940bb6
Showing 117 changed files with 4,610 additions and 3,266 deletions.
4 changes: 2 additions & 2 deletions browser/extensions/pdfjs/README.mozilla
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion browser/extensions/pdfjs/content/PdfJsDefaultPreferences.jsm
Original file line number Diff line number Diff line change
@@ -37,5 +37,7 @@ var PdfJsDefaultPreferences = Object.freeze({
"renderInteractiveForms": false,
"enablePrintAutoRotate": false,
"disablePageMode": false,
"disablePageLabels": false
"disablePageLabels": false,
"scrollModeOnLoad": 0,
"spreadModeOnLoad": 0
});
10 changes: 5 additions & 5 deletions browser/extensions/pdfjs/content/build/pdf.js
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions browser/extensions/pdfjs/content/build/pdf.worker.js
Original file line number Diff line number Diff line change
@@ -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}".`);
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions browser/extensions/pdfjs/content/web/viewer.css
Original file line number Diff line number Diff line change
@@ -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/[email protected]);
}

.secondaryToolbarButton.scrollVertical::before {
content: url(images/[email protected]);
}

.secondaryToolbarButton.scrollHorizontal::before {
content: url(images/[email protected]);
}

.secondaryToolbarButton.scrollWrapped::before {
content: url(images/[email protected]);
}

.secondaryToolbarButton.spreadNone::before {
content: url(images/[email protected]);
}

.secondaryToolbarButton.spreadOdd::before {
content: url(images/[email protected]);
}

.secondaryToolbarButton.spreadEven::before {
content: url(images/[email protected]);
}

.secondaryToolbarButton.documentProperties::before {
content: url(images/[email protected]);
}
26 changes: 25 additions & 1 deletion browser/extensions/pdfjs/content/web/viewer.html
Original file line number Diff line number Diff line change
@@ -146,7 +146,31 @@

<div class="horizontalToolbarSeparator"></div>

<button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="62" data-l10n-id="document_properties">
<button id="scrollVertical" class="secondaryToolbarButton scrollVertical toggled" title="Use Vertical Scrolling" tabindex="62" data-l10n-id="scroll_vertical">
<span data-l10n-id="scroll_vertical_label">Vertical Scrolling</span>
</button>
<button id="scrollHorizontal" class="secondaryToolbarButton scrollHorizontal" title="Use Horizontal Scrolling" tabindex="63" data-l10n-id="scroll_horizontal">
<span data-l10n-id="scroll_horizontal_label">Horizontal Scrolling</span>
</button>
<button id="scrollWrapped" class="secondaryToolbarButton scrollWrapped" title="Use Wrapped Scrolling" tabindex="64" data-l10n-id="scroll_wrapped">
<span data-l10n-id="scroll_wrapped_label">Wrapped Scrolling</span>
</button>

<div class="horizontalToolbarSeparator"></div>

<button id="spreadNone" class="secondaryToolbarButton spreadNone toggled" title="Do not join page spreads" tabindex="65" data-l10n-id="spread_none">
<span data-l10n-id="spread_none_label">No Spreads</span>
</button>
<button id="spreadOdd" class="secondaryToolbarButton spreadOdd" title="Join page spreads starting with odd-numbered pages" tabindex="66" data-l10n-id="spread_odd">
<span data-l10n-id="spread_odd_label">Odd Spreads</span>
</button>
<button id="spreadEven" class="secondaryToolbarButton spreadEven" title="Join page spreads starting with even-numbered pages" tabindex="67" data-l10n-id="spread_even">
<span data-l10n-id="spread_even_label">Even Spreads</span>
</button>

<div class="horizontalToolbarSeparator"></div>

<button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="68" data-l10n-id="document_properties">
<span data-l10n-id="document_properties_label">Document Properties…</span>
</button>
</div>
Loading

0 comments on commit 8940bb6

Please sign in to comment.