PDF Viewer Update: Populate pageselector with current/total count.

Use a Polymer binding to pass down |docLength| and |pageNo| instead of
programmatically updating the toolbar. Also update the old
<pdf-viewer-toolbar> to use the same mechanism, for simplifcity.

Fixed: 1100432
Change-Id: Ifbd6b0230094bd7e82861ed2d00cf1271cc727ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274185Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784015}

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar-new.html

@@ -71,7 +71,7 @@
   <span>Title</span>
 </div>
 <div id="center">
-  <viewer-page-selector doc-length="100" page-no="5">
+  <viewer-page-selector doc-length="[[docLength]]" page-no="[[pageNo]]">
   </viewer-page-selector>
   <span id="zoom-controls">
     <cr-icon-button iron-icon="pdf:remove"></cr-icon-button>

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar-new.js

@@ -18,6 +18,13 @@ class ViewerPdfToolbarNewElement extends PolymerElement {
   static get template() {
     return html`{__html_template__}`;
   }
+
+  static get properties() {
+    return {
+      docLength: Number,
+      pageNo: Number,
+    };
+  }
 }
 customElements.define(
     ViewerPdfToolbarNewElement.is, ViewerPdfToolbarNewElement);

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar.js

@@ -70,7 +70,6 @@ Polymer({
       value: false,
     },
 
-    /** The number of pages in the PDF document. */
     docLength: Number,
 
     /** The title of the PDF document. */
@@ -97,7 +96,6 @@ Polymer({
       value: true,
     },
 
-    /** The number of the page being viewed (1-based). */
     pageNo: Number,
 
     /**

chrome/browser/resources/pdf/pdf_viewer.html

@@ -26,6 +26,7 @@
       has-edits="[[hasEdits_]]"
       has-entered-annotation-mode="[[hasEnteredAnnotationMode_]]"
       is-form-field-focused="[[isFormFieldFocused_]]"
+      doc-length="[[docLength_]]" page-no="[[pageNo_]]"
       on-save="onToolbarSave_" on-print="onPrint_"
       on-annotation-mode-toggled="onAnnotationModeToggled_"
       on-annotation-tool-changed="onAnnotationToolChanged_"
@@ -34,7 +35,8 @@
   </viewer-pdf-toolbar>
 </template>
 <template is="dom-if" if="[[pdfViewerUpdateEnabled_]]">
-  <viewer-pdf-toolbar-new id="toolbar" hidden>
+  <viewer-pdf-toolbar-new id="toolbar"
+      doc-length="[[docLength_]]" page-no="[[pageNo_]]" hidden>
   </viewer-pdf-toolbar-new>
 </template>
 

chrome/browser/resources/pdf/pdf_viewer.js

@@ -136,6 +136,9 @@ class PDFViewerElement extends PDFViewerBaseElement {
               'pdf-viewer-update-enabled');
         },
       },
+
+      docLength_: Number,
+      pageNo_: Number,
     };
   }
 
@@ -198,6 +201,18 @@ class PDFViewerElement extends PDFViewerBaseElement {
     /** @private {string} */
     this.title_ = '';
 
+    /**
+     * The number of pages in the PDF document.
+     * @private {number}
+     */
+    this.docLength_;
+
+    /**
+     * The number of the page being viewed (1-based).
+     * @private {number}
+     */
+    this.pageNo_;
+
     /** @private {boolean} */
     this.pdfViewerUpdateEnabled_;
   }
@@ -590,9 +605,9 @@ class PDFViewerElement extends PDFViewerBaseElement {
     }
 
     // Update the page indicator.
-    const visiblePage = this.viewport.getMostVisiblePage();
     if (this.toolbarEnabled_) {
-      this.getToolbar_().pageNo = visiblePage + 1;
+      const visiblePage = this.viewport.getMostVisiblePage();
+      this.pageNo_ = visiblePage + 1;
     }
 
     this.currentController.viewportChanged();
@@ -696,8 +711,7 @@ class PDFViewerElement extends PDFViewerBaseElement {
     }
 
     if (this.toolbarEnabled_) {
-      this.getToolbar_().docLength =
-          this.documentDimensions.pageDimensions.length;
+      this.docLength_ = this.documentDimensions.pageDimensions.length;
     }
   }