summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/resources/pdf
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-24 11:30:15 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-30 12:56:19 +0000
commit6036726eb981b6c4b42047513b9d3f4ac865daac (patch)
tree673593e70678e7789766d1f732eb51f613a2703b /chromium/chrome/browser/resources/pdf
parent466052c4e7c052268fd931888cd58961da94c586 (diff)
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/pdf')
-rw-r--r--chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js2
-rw-r--r--chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html14
-rw-r--r--chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html4
-rw-r--r--chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html4
-rw-r--r--chromium/chrome/browser/resources/pdf/index.html2
-rw-r--r--chromium/chrome/browser/resources/pdf/pdf_scripting_api.js2
-rw-r--r--chromium/chrome/browser/resources/pdf/pdf_viewer.js (renamed from chromium/chrome/browser/resources/pdf/pdf.js)7
7 files changed, 19 insertions, 16 deletions
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js
index 7a58c192af5..b05ae400a39 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.js
@@ -60,7 +60,7 @@ Polymer({
depthChanged: function() {
this.childDepth = this.depth + 1;
- this.$.item.style.webkitPaddingStart =
+ this.$.item.style.paddingInlineStart =
(this.depth * BOOKMARK_INDENT) + 'px';
},
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html
index 632001dd749..2f11b9dbb81 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.html
@@ -23,18 +23,18 @@
--cr-input-background-color: transparent;
--cr-input-color: white;
--cr-input-input: {
- -webkit-margin-start: -3px;
- -webkit-padding-end: 3px;
- -webkit-padding-start: 3px;
- padding-bottom: 0;
- padding-top: 0;
text-align: end;
caret-color: #fff;
border-radius: 2px;
box-sizing: content-box;
+ margin-inline-start: -3px;
}
- -webkit-margin-start: -3px;
+ --cr-input-padding-end: 3px;
+ --cr-input-padding-start: 3px;
+ --cr-input-padding-bottom: 0;
+ --cr-input-padding-top: 0;
height: 100%;
+ margin-inline-start: -3px;
width: 1ch;
}
@@ -48,7 +48,7 @@
}
#pagelength-spacer {
- -webkit-margin-start: -2px;
+ margin-inline-start: -2px;
text-align: start;
}
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
index 00b23ce44cb..8b218a7bdc6 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
@@ -51,11 +51,11 @@
}
paper-icon-button {
- -webkit-margin-end: 12px;
+ margin-inline-end: 12px;
}
viewer-toolbar-dropdown {
- -webkit-margin-end: 4px;
+ margin-inline-end: 4px;
}
paper-progress {
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html
index c0424470e25..334ed97bcdb 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown/viewer-toolbar-dropdown.html
@@ -54,8 +54,8 @@
}
#arrow {
- -webkit-margin-start: -12px;
- -webkit-padding-end: 4px;
+ margin-inline-start: -12px;
+ padding-inline-end: 4px;
}
h1 {
diff --git a/chromium/chrome/browser/resources/pdf/index.html b/chromium/chrome/browser/resources/pdf/index.html
index dcec3cc7343..f509a2d62e0 100644
--- a/chromium/chrome/browser/resources/pdf/index.html
+++ b/chromium/chrome/browser/resources/pdf/index.html
@@ -40,6 +40,6 @@
<script src="browser_api.js"></script>
<script src="coords_transformer.js"></script>
<script src="metrics.js"></script>
-<script src="pdf.js"></script>
+<script src="pdf_viewer.js"></script>
<script src="main.js"></script>
</html>
diff --git a/chromium/chrome/browser/resources/pdf/pdf_scripting_api.js b/chromium/chrome/browser/resources/pdf/pdf_scripting_api.js
index 6ade6be31d0..dac347df1d6 100644
--- a/chromium/chrome/browser/resources/pdf/pdf_scripting_api.js
+++ b/chromium/chrome/browser/resources/pdf/pdf_scripting_api.js
@@ -12,6 +12,7 @@ function DeserializeKeyEvent(dict) {
var e = document.createEvent('Event');
e.initEvent('keydown', true, true);
e.keyCode = dict.keyCode;
+ e.code = dict.code;
e.shiftKey = dict.shiftKey;
e.ctrlKey = dict.ctrlKey;
e.altKey = dict.altKey;
@@ -29,6 +30,7 @@ function DeserializeKeyEvent(dict) {
function SerializeKeyEvent(event) {
return {
keyCode: event.keyCode,
+ code: event.code,
shiftKey: event.shiftKey,
ctrlKey: event.ctrlKey,
altKey: event.altKey,
diff --git a/chromium/chrome/browser/resources/pdf/pdf.js b/chromium/chrome/browser/resources/pdf/pdf_viewer.js
index 6de1c5cc3c5..84ac5072c2d 100644
--- a/chromium/chrome/browser/resources/pdf/pdf.js
+++ b/chromium/chrome/browser/resources/pdf/pdf_viewer.js
@@ -106,7 +106,7 @@ function PDFViewer(browserApi) {
this.delayedScriptingMessages_ = [];
this.isPrintPreview_ = location.origin === 'chrome://print';
- this.isPrintPreviewLoaded_ = false;
+ this.isPrintPreviewLoadingFinished_ = false;
this.isUserInitiatedEvent_ = true;
/**
@@ -521,7 +521,7 @@ PDFViewer.prototype = {
sendDocumentLoadedMessage_: function() {
if (this.loadState_ == LoadState.LOADING)
return;
- if (this.isPrintPreview_ && !this.isPrintPreviewLoaded_)
+ if (this.isPrintPreview_ && !this.isPrintPreviewLoadingFinished_)
return;
this.sendScriptingMessage_(
{type: 'documentLoaded', load_state: this.loadState_});
@@ -598,6 +598,7 @@ PDFViewer.prototype = {
this.passwordScreen_.close();
}
this.loadState_ = LoadState.FAILED;
+ this.isPrintPreviewLoadingFinished_ = true;
this.sendDocumentLoadedMessage_();
} else if (progress == 100) {
// Document load complete.
@@ -718,7 +719,7 @@ PDFViewer.prototype = {
}
break;
case 'printPreviewLoaded':
- this.isPrintPreviewLoaded_ = true;
+ this.isPrintPreviewLoadingFinished_ = true;
this.sendDocumentLoadedMessage_();
break;
case 'setScrollPosition':