1 files changed, 10 insertions, 14 deletions

diff --git a/chromium/chrome/browser/resources/pdf/pdf_viewer.js b/chromium/chrome/browser/resources/pdf/pdf_viewer.js
index 862b73894fd..84d9df519ea 100644
--- a/chromium/chrome/browser/resources/pdf/pdf_viewer.js
+++ b/chromium/chrome/browser/resources/pdf/pdf_viewer.js
@@ -140,12 +140,6 @@ function PDFViewer(browserApi) {
       (chrome.metricsPrivate ? new PDFMetricsImpl() : new PDFMetricsDummy());
   this.metrics.onDocumentOpened();
 
-  /**
-   * @private {!PDFCoordsTransformer}
-   */
-  this.coordsTransformer_ =
-      new PDFCoordsTransformer(this.postMessage_.bind(this));
-
   // Parse open pdf parameters.
   this.paramsParser_ = new OpenPDFParamsParser(this.postMessage_.bind(this));
   var toolbarEnabled =
@@ -267,11 +261,8 @@ function PDFViewer(browserApi) {
   });
 
   document.body.addEventListener('change-page-and-xy', e => {
-    // The coordinates received in |e| are in page coordinates and need to be
-    // transformed to screen coordinates.
-    this.coordsTransformer_.request(
-        this.goToPageAndXY_.bind(this, e.detail.origin, e.detail.page), {},
-        e.detail.page, e.detail.x, e.detail.y);
+    const point = this.viewport_.convertPageToScreen(e.detail.page, e.detail);
+    this.goToPageAndXY_(e.detail.origin, e.detail.page, point);
   });
 
   document.body.addEventListener('navigate', e => {
@@ -484,6 +475,7 @@ PDFViewer.prototype = {
    */
   rotateClockwise_: function() {
     this.metrics.onRotation();
+    this.viewport_.rotateClockwise(1);
     this.postMessage_({type: 'rotateClockwise'});
   },
 
@@ -494,6 +486,7 @@ PDFViewer.prototype = {
    */
   rotateCounterClockwise_: function() {
     this.metrics.onRotation();
+    this.viewport_.rotateClockwise(3);
     this.postMessage_({type: 'rotateCounterclockwise'});
   },
 
@@ -652,7 +645,10 @@ PDFViewer.prototype = {
     document.documentElement.dir = strings.textdirection;
     document.documentElement.lang = strings.language;
 
+    loadTimeData.data = strings;
     $('toolbar').strings = strings;
+    $('toolbar').pdfAnnotationsEnabled =
+        loadTimeData.getBoolean('pdfAnnotationsEnabled');
     $('zoom-toolbar').strings = strings;
     $('password-screen').strings = strings;
     $('error-screen').strings = strings;
@@ -778,9 +774,6 @@ PDFViewer.prototype = {
       case 'formFocusChange':
         this.isFormFieldFocused_ = message.data.focused;
         break;
-      case 'transformPagePointReply':
-        this.coordsTransformer_.onReplyReceived(message);
-        break;
       case 'saveData':
         this.saveData_(message.data);
         break;
@@ -798,6 +791,9 @@ PDFViewer.prototype = {
    * @private
    */
   saveData_: function(messageData) {
+    if (!loadTimeData.getBoolean('pdfFormSaveEnabled'))
+      throw new Error('Internal error: save not enabled.');
+
     // Verify a token that was created by this instance is included to avoid
     // being spammed.
     if (!this.pendingTokens_.delete(messageData.token))