diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/chrome/browser/resources/pdf/elements | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/pdf/elements')
13 files changed, 121 insertions, 117 deletions
diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.html b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.html index d3c11673161..ae14eeb289f 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.html +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-bookmark/viewer-bookmark.html @@ -2,6 +2,7 @@ <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html"> +<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripple.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html"> @@ -17,7 +18,7 @@ } #item:hover { - background-color: rgb(237, 237, 237); + background-color: var(--cr-menu-background-focus-color); } paper-ripple { diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html index 97ddcc14898..25737d45127 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-error-screen/viewer-error-screen.html @@ -1,20 +1,19 @@ <link rel="import" href="chrome://resources/html/polymer.html"> +<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> -<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html"> -<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <dom-module id="viewer-error-screen"> <template> - <style include="paper-button-style cr-hidden-style"></style> + <style include="cr-hidden-style"></style> <cr-dialog id="dialog" no-cancel> <div slot="title">[[strings.errorDialogTitle]]</div> <div slot="body">[[strings.pageLoadFailed]]</div> <div slot="button-container" hidden$="[[!reloadFn]]"> - <paper-button class="action-button" on-click="reload"> + <cr-button class="action-button" on-click="reload"> [[strings.pageReload]] - </paper-button> + </cr-button> </div> </cr-dialog> </template> diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.html b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.html index e86b7915e37..1e9e1ee4f67 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.html +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-form-warning/viewer-form-warning.html @@ -1,23 +1,22 @@ <link rel="import" href="chrome://resources/html/polymer.html"> +<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> -<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html"> -<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <dom-module id="viewer-form-warning"> <template> - <style include="paper-button-style cr-hidden-style"></style> + <style include="cr-hidden-style"></style> <cr-dialog id="dialog" no-cancel> <div slot="title">[[strings.annotationFormWarningTitle]]</div> <div slot="body">[[strings.annotationFormWarningDetail]]</div> <div slot="button-container"> - <paper-button class="cancel-button" on-click="onCancel"> + <cr-button class="cancel-button" on-click="onCancel"> [[strings.annotationFormWarningKeepEditing]] - </paper-button> - <paper-button class="action-button" on-click="onAction"> + </cr-button> + <cr-button class="action-button" on-click="onAction"> [[strings.annotationFormWarningDiscard]] - </paper-button> + </cr-button> </div> </cr-dialog> </template> diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.html b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.html index e815e1cbc57..70ad2578685 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.html +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.html @@ -7,6 +7,7 @@ <style> :host { display: flex; + opacity: 0; pointer-events: none; position: fixed; right: 0; diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.js b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.js index c0a3e0bac1d..50ad4f4cb49 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.js +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-indicator/viewer-page-indicator.js @@ -18,18 +18,14 @@ Polymer({ /** @override */ ready: function() { - const callback = this.fadeIn.bind(this, 2000); + const callback = this.fadeIn_.bind(this); window.addEventListener('scroll', function() { requestAnimationFrame(callback); }); }, - initialFadeIn: function() { - this.fadeIn(6000); - }, - - /** @param {number} displayTime */ - fadeIn: function(displayTime) { + /** @private */ + fadeIn_: function() { const percent = window.scrollY / (document.scrollingElement.scrollHeight - document.documentElement.clientHeight); @@ -55,7 +51,7 @@ Polymer({ this.timerId = setTimeout(() => { this.style.opacity = 0; this.timerId = undefined; - }, displayTime); + }, 2000); }, pageLabelsChanged: function() { 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 d7c9c12b887..e1fdc869efe 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 @@ -7,6 +7,7 @@ <style> :host { color: #fff; + display: flex; font-size: 0.81rem; } @@ -14,58 +15,39 @@ background: rgba(255, 255, 255, 0.3); } + #pageselector-container, + #pagelength-spacer { + padding: 0 3px; + text-align: start; + /* --page-length-digits is set through JavaScript */ + width: calc(var(--page-length-digits, 1) * 1ch); + } + + #pageselector-container:focus-within, + #pageselector-container:hover { + background: rgba(0, 0, 0, 0.5); + } + #pageselector { --cr-input-focus-color: transparent; - --cr-input-container: { - overflow: initial; - } --cr-input-error-display: none; --cr-input-background-color: transparent; --cr-input-color: white; - --cr-input-inner-container: { - margin-inline-end: -3px; - } - --cr-input-input: { - text-align: end; - caret-color: #fff; - border-radius: 2px; - box-sizing: content-box; - margin-inline-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; - } - - #pageselector[focused_], - #pageselector:hover { - --cr-input-background-color: rgba(0, 0, 0, 0.5); } - #slash { - padding: 0 3px; - } - - #pagelength-spacer { - margin-inline-start: -2px; - text-align: start; - } - - #pageselector, - #slash, - #pagelength-spacer { - display: inline-block; + #pageselector::part(input) { + caret-color: var(--cr-input-color); + padding: 0; + text-align: end; } </style> - <cr-input id="pageselector" value="[[pageNo]]" on-mouseup="select" - on-value-changed="onInputValueChange_" on-change="pageNoCommitted" - aria-label$="{{strings.labelPageNumber}}"> - </cr-input> - <span id="slash"> / </span> + <div id="pageselector-container"> + <cr-input id="pageselector" value="[[pageNo]]" on-mouseup="select" + on-value-changed="onInputValueChange_" on-change="pageNoCommitted" + aria-label$="{{strings.labelPageNumber}}"> + </cr-input> + </div> + <span id="slash">/</span> <span id="pagelength-spacer"> <span id="pagelength">{{docLength}}</span> </span> diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js index c4483e97d6b..b7999237a98 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-page-selector/viewer-page-selector.js @@ -43,12 +43,7 @@ Polymer({ /** @private */ docLengthChanged_: function() { const numDigits = this.docLength.toString().length; - // Set both sides of the slash to the same width, so that the layout is - // exactly centered. We add 1px because the unit `ch` does not provide - // exact whole number pixels, and therefore seems to have 1px-off bugginess. - const width = `calc(${numDigits}ch + 1px)`; - this.pageSelector.style.width = width; - this.$['pagelength-spacer'].style.width = width; + this.style.setProperty('--page-length-digits', `${numDigits}`); }, select: function() { diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html index 5120c53c078..aebc16bf138 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-password-screen/viewer-password-screen.html @@ -1,15 +1,14 @@ <link rel="import" href="chrome://resources/html/polymer.html"> +<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html"> -<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> -<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <dom-module id="viewer-password-screen"> <template> - <style include="cr-shared-style paper-button-style"> + <style include="cr-shared-style"> #password { margin-top: var(--cr-form-field-bottom-spacing); } @@ -26,9 +25,9 @@ </cr-input> </div> <div slot="button-container"> - <paper-button id="submit" class="action-button" on-click="submit"> + <cr-button id="submit" class="action-button" on-click="submit"> [[strings.passwordSubmit]] - </paper-button> + </cr-button> </div> </cr-dialog> </template> 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 2f87e5efc14..f6454c97a5c 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 @@ -204,8 +204,8 @@ title$="{{strings.tooltipDownload}}"></cr-icon-button> <cr-icon-button id="print" iron-icon="cr:print" on-click="print" - aria-label$="{{strings.tooltipPrint}}" - title$="{{strings.tooltipPrint}}"></cr-icon-button> + hidden="[[!printingEnabled]]" title$="{{strings.tooltipPrint}}" + aria-label$="{{strings.tooltipPrint}}"></cr-icon-button> <viewer-toolbar-dropdown id="bookmarks" selected diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js index 8e18564aa75..006aa5ca5b8 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js @@ -80,6 +80,14 @@ Polymer({ value: false, }, + /** + * Whether the Printing feature is enabled. + */ + printingEnabled: { + type: Boolean, + value: false, + }, + strings: Object, }, 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 50dadbe03bd..c1964a19a20 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 @@ -1,6 +1,6 @@ <link rel="import" href="chrome://resources/html/polymer.html"> -<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> +<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> @@ -33,8 +33,7 @@ } #dropdown { - @apply --shadow-elevation-2dp; - background-color: rgb(256, 256, 256); + background-color: var(--cr-menu-background-color); border-radius: 4px; color: var(--cr-primary-text-color); overflow-y: hidden; @@ -42,6 +41,20 @@ width: var(--dropdown-width); } + @media (prefers-color-scheme: light) { + #dropdown { + @apply --shadow-elevation-2dp; + } + } + + @media (prefers-color-scheme: dark) { + #dropdown { + background-image: linear-gradient(var(--cr-menu-background-sheen), + var(--cr-menu-background-sheen)); + box-shadow: var(--cr-menu-shadow); + } + } + #scroll-container { max-height: 300px; overflow-y: auto; @@ -49,23 +62,11 @@ } #button { - border-radius: 4px; - cursor: pointer; - display: inline-block; - height: 32px; + --cr-icon-button-color: currentColor; + --cr-icon-button-height: 32px; + --cr-icon-button-icon-start-offset: 4px; + --cr-icon-button-width: 48px; margin: 0; - min-width: 48px; - opacity: 0.38; - padding-bottom: 6px; - padding-inline-end: 2px; - padding-inline-start: 6px; - padding-top: 6px; - width: 48px; - } - - #button:focus { - background-color: rgba(255, 255, 255, 0.24); - opacity: 1; } #button:hover { @@ -82,18 +83,16 @@ } h1 { - border-bottom: 1px solid rgb(219, 219, 219); + border-bottom: var(--cr-separator-line); font-size: 0.87rem; font-weight: 500; margin: 0; padding: 14px 28px; } </style> - <paper-button on-click="toggleDropdown" id="button" - aria-label$="{{header}}" title$="{{header}}"> - <iron-icon icon="[[dropdownIcon]]"></iron-icon> - <iron-icon icon="cr:arrow-drop-down"></iron-icon> - </paper-button> + <cr-icon-button on-click="toggleDropdown" id="button" + iron-icon="[[dropdownIcon]],cr:arrow-drop-down" title$="[[header]]"> + </cr-icon-button> <div id="container"> <div id="dropdown" style="display: none"> diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html index be487dc81a0..a3ae841c93f 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.html @@ -54,13 +54,17 @@ color: white; } - :host-context(:not([dark])):host([new-print-preview]) cr-icon-button { - --cr-icon-button-ripple-opacity: .5; + @media (prefers-color-scheme: light) { + :host([new-print-preview]) cr-icon-button { + --cr-icon-button-ripple-opacity: .5; + } } - :host-context([dark]):host([new-print-preview]) cr-icon-button { - background-color: var(--google-grey-900); - color: var(--google-grey-200); + @media (prefers-color-scheme: dark) { + :host([new-print-preview]) cr-icon-button { + background-color: var(--google-grey-900); + color: var(--google-grey-200); + } } :host([keyboard-navigation-active]) cr-icon-button:focus { diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js index 1b17b8b130a..fb817a5a01d 100644 --- a/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js +++ b/chromium/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-toolbar.js @@ -28,10 +28,6 @@ Polymer({ computed: 'computeShowOnLeft_(newPrintPreview)', reflectToAttribute: true, }, - - strings: {type: Object, observer: 'updateTooltips_'}, - - visible_: {type: Boolean, value: true} }, listeners: { @@ -40,25 +36,50 @@ Polymer({ 'pointerdown': 'onPointerDown_', }, + /** @private {boolean} */ + isPrintPreview_: false, + + /** @private {boolean} */ + visible_: true, + + /** @param {boolean} isPrintPreview */ + setIsPrintPreview: function(isPrintPreview) { + this.isPrintPreview_ = isPrintPreview; + }, + + /** @return {boolean} */ + isPrintPreview: function() { + return this.isPrintPreview_; + }, + isVisible: function() { return this.visible_; }, /** @private */ onFocus_: function() { - // This can only happen when the plugin is shown within Print Preview. + // This can only happen when the plugin is shown within Print Preview using + // keyboard navigation. if (!this.visible_) { + assert(this.isPrintPreview_); + this.fire('keyboard-navigation-active', true); this.show(); } }, /** @private */ onKeyUp_: function() { + if (this.isPrintPreview_) { + this.fire('keyboard-navigation-active', true); + } this.keyboardNavigationActive_ = true; }, /** @private */ onPointerDown_: function() { + if (this.isPrintPreview_) { + this.fire('keyboard-navigation-active', false); + } this.keyboardNavigationActive_ = false; }, @@ -72,14 +93,14 @@ Polymer({ }, /** - * @private * Change button tooltips to match any changes to localized strings. + * @param {!Object} strings */ - updateTooltips_: function() { + setStrings: function(strings) { this.$['fit-button'].tooltips = - [this.strings.tooltipFitToPage, this.strings.tooltipFitToWidth]; - this.$['zoom-in-button'].tooltips = [this.strings.tooltipZoomIn]; - this.$['zoom-out-button'].tooltips = [this.strings.tooltipZoomOut]; + [strings.tooltipFitToPage, strings.tooltipFitToWidth]; + this.$['zoom-in-button'].tooltips = [strings.tooltipZoomIn]; + this.$['zoom-out-button'].tooltips = [strings.tooltipZoomOut]; }, /** |