More precise use of multiline state

chrome/browser/resources/chromeos/chromevox/cvox2/background/editing.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview Processes events related to editing text and emits the
  * appropriate spoken and braille feedback.
  */
 
 goog.provide('editing.TextEditHandler');
@@ skipping 96 matching lines @@
  * @extends {cvox.ChromeVoxEditableTextBase}
  */
 function AutomationEditableText(node) {
   if (!node.state.editable)
     throw Error('Node must have editable state set to true.');
   var start = node.textSelStart;
   var end = node.textSelEnd;
   cvox.ChromeVoxEditableTextBase.call(
       this, node.value || '', Math.min(start, end), Math.max(start, end),
       node.state[StateType.PROTECTED] /**password*/, cvox.ChromeVox.tts);
-  /** @override */
-  this.multiline = node.state[StateType.MULTILINE] || false;
   /** @type {!AutomationNode} @private */
   this.node_ = node;
-  /** @type {Array<number>} @private */
-  this.lineBreaks_ = [];
 }
 
 AutomationEditableText.prototype = {
   __proto__: cvox.ChromeVoxEditableTextBase.prototype,
 
   /**
    * Called when the text field has been updated.
    */
   onUpdate: function() {
     var newValue = this.node_.value || '';
 
-    if (this.value != newValue)
-      this.lineBreaks_ = [];
-
     var textChangeEvent = new cvox.TextChangeEvent(
         newValue, this.node_.textSelStart || 0, this.node_.textSelEnd || 0,
         true /* triggered by user */);
     this.changed(textChangeEvent);
     this.outputBraille_();
   },
 
   /** @override */
   getLineIndex: function(charIndex) {
-    if (!this.multiline)
+    var breaks = this.node_.lineBreaks || [];
+    if (!breaks.length)
       return 0;
-    var breaks = this.node_.lineBreaks || [];
     var index = 0;
     while (index < breaks.length && breaks[index] <= charIndex)
       ++index;
     return index;
   },
 
   /** @override */
   getLineStart: function(lineIndex) {
-    if (!this.multiline || lineIndex == 0)
+    if (lineIndex == 0)
       return 0;
     var breaks = this.getLineBreaks_();
+    if (breaks.length < 1)
+      return 0;
     return breaks[lineIndex - 1] || this.node_.value.length;
   },
 
   /** @override */
   getLineEnd: function(lineIndex) {
     var breaks = this.getLineBreaks_();
     var value = this.node_.value;
     if (lineIndex >= breaks.length)
       return value.length;
     return breaks[lineIndex] - 1;
   },
 
   /**
    * @return {Array<number>}
    * @private
    */
   getLineBreaks_: function() {
     // node.lineBreaks is undefined when the multiline field has no line
     // breaks.
     return this.node_.lineBreaks || [];
   },
 
   /** @private */
   outputBraille_: function() {
     var isFirstLine = false;  // First line in a multiline field.
     var output = new Output();
     var range;
-    if (this.multiline) {
+    if (this.getLineBreaks_().length) {

[David Tseng, 2017/06/27 18:41:14]

This isn't equivalent. Whether something is not multiline isn't the same as
whether the text field has no line breaks

       var lineIndex = this.getLineIndex(this.start);
       if (lineIndex == 0) {
         isFirstLine = true;
         output.formatForBraille('$name', this.node_);
       }
       range = new Range(
           new Cursor(this.node_, this.getLineStart(lineIndex)),
           new Cursor(this.node_, this.getLineEnd(lineIndex)));
     } else {
       range = Range.fromNode(this.node_);
@@ skipping 568 matching lines @@
    * @return {boolean}
    */
   isSameLineAndSelection: function(otherLine) {
     return this.isSameLine(otherLine) &&
         this.startOffset == otherLine.startOffset &&
         this.endOffset == otherLine.endOffset;
   }
 };
 
 });