Merge "print_preview: Workaround of focus-scroll issue." to M51

chrome/browser/resources/print_preview/previewarea/margin_control.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * Draggable control for setting a page margin.
    * @param {!print_preview.ticket_items.CustomMargins.Orientation} orientation
@@ skipping 331 matching lines @@
       this.textbox_ = null;
       this.marginLineEl_ = null;
     },
 
     /**
      * @param {boolean} isFocused Whether the margin control is in focus.
      * @private
      */
     setIsFocused_: function(isFocused) {
       this.isFocused_ = isFocused;
+      // TODO(tkent): This is a workaround of a preview-area scrolling
+      // issue. Blink scrolls preview-area on focus, but we don't want it.  We
+      // should adjust scroll position of PDF preview and positions of
+      // MarginContgrols here, or restructure the HTML so that the PDF review
+      // and MarginControls are on the single scrollable container.
+      // crbug.com/601341
+      if (isFocused) {
+        var previewArea = $('preview-area');
+        previewArea.scrollTop = 0;
+        previewArea.scrollLeft = 0;
+      }
     },
 
     /**
      * Called whenever a mousedown event occurs on the component.
      * @param {MouseEvent} event The event that occured.
      * @private
      */
     onMouseDown_: function(event) {
       if (!this.textbox_.disabled &&
           event.button == 0 &&
           (event.target == this.getElement() ||
               event.target == this.marginLineEl_)) {
         this.mouseStartPositionInPixels_ =
             new print_preview.Coordinate2d(event.x, event.y);
         this.marginStartPositionInPixels_ = new print_preview.Coordinate2d(
             this.getElement().offsetLeft, this.getElement().offsetTop);
         this.setIsInError(false);
         cr.dispatchSimpleEvent(this, MarginControl.EventType.DRAG_START);
       }
     },
 
     /**
      * Called when opacity CSS transition ends.
      * @private
      */
     onWebkitTransitionEnd_: function(event) {
       if (event.propertyName != 'opacity')
         return;
       var elStyle = window.getComputedStyle(this.getElement());
-      var opacity = parseInt(elStyle.getPropertyValue('opacity'), 10);
-      this.textbox_.setAttribute('aria-hidden', opacity == 0);
+      var disabled = parseInt(elStyle.getPropertyValue('opacity'), 10) == 0;
+      this.textbox_.setAttribute('aria-hidden', disabled);
+      this.textbox_.disabled = disabled;
     },
 
     /**
      * Called when textbox content changes. Starts text change timeout.
      * @private
      */
     onTextboxInput_: function(event) {
       if (this.textTimeout_) {
         clearTimeout(this.textTimeout_);
         this.textTimeout_ = null;
@@ skipping 39 matching lines @@
       this.setIsFocused_(false);
       cr.dispatchSimpleEvent(this, MarginControl.EventType.TEXT_CHANGE);
     }
   };
 
   // Export
   return {
     MarginControl: MarginControl
   };
 });