Reland: Expand EditableLine to include non-inline text box leafs

chrome/browser/resources/chromeos/chromevox/cvox2/background/editing_test.extjs

 // 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.
 
 // Include test fixture.
 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js',
              '../../testing/assert_additions.js']);
 
 GEN_INCLUDE(['../../testing/mock_feedback.js']);
 
@@ skipping 466 matching lines @@
           .expectSpeech('s', 'selected')
           .call(moveByChar)
           .expectSpeech('t', 'added to selection')
 
           .replay();
     });
     input.focus();
   });
 });
 
+TEST_F('EditingTest', 'RichTextImageByCharacter', function() {
+  var mockFeedback = this.createMockFeedback();
+  this.runWithLoadedTree(function() {/*!
+    <p id="go" contenteditable>
+      <img alt="dog"></img> is a <img alt="cat"</img> test
+    </p>
+    <script>
+      document.getElementById('go').addEventListener('click', function() {
+        var sel = getSelection();
+        sel.modify('move', 'forward', 'character');
+      }, true);
+    </script>
+  */}, function(root) {
+    var input = root.find({role: RoleType.PARAGRAPH});
+    var moveByChar = input.doDefault.bind(input);
+
+    this.listenOnce(input, 'focus', function() {
+      var lineText = 'dog is a cat test';
+      mockFeedback.call(moveByChar)
+          // Note that this isn't quite correct. This should be the second
+          // character which is a space ' '.
+          .expectSpeech('dog', 'Image')
+          // Ditto.
+          .expectBraille(lineText, {startIndex: 0, endIndex: 0})
+          .call(moveByChar)
+          .expectSpeech('i')
+          .expectBraille(lineText, {startIndex: 4, endIndex: 4})
+          .call(moveByChar)
+          .expectSpeech('s')
+          .expectBraille(lineText, {startIndex: 5, endIndex: 5})
+          .call(moveByChar)
+          .expectSpeech(' ')
+          .expectBraille(lineText, {startIndex: 6, endIndex: 6})
+          .call(moveByChar)
+          .expectSpeech('a')
+          .expectBraille(lineText, {startIndex: 7, endIndex: 7})
+          .call(moveByChar)
+          .expectSpeech(' ')
+          .expectBraille(lineText, {startIndex: 8, endIndex: 8})
+          .call(moveByChar)
+
+          // This is technically wrong because we're actually over the entire
+          // image. This is broken because of bad node offsets.
+          .expectSpeech('c')
+          .expectBraille(lineText, {startIndex: 9, endIndex: 9})
+
+          // Unfortunately, the node offset being wrong here means there's no
+          // output for the next character move. Fix Once node offsets get fixed
+          // in Blink.
+
+          .replay();
+    });
+    input.focus();
+  });
+});
+
 TEST_F('EditingTest', 'EditableLineOneStaticText', function() {
   this.runWithLoadedTree(function() {/*!
     <p contenteditable style="word-spacing:100000px">this is a test</p>
   */}, function(root) {
     var staticText = root.find({role: RoleType.STATIC_TEXT});
 
     var e = new editing.EditableLine(staticText, 0, staticText, 0);
     assertEquals('this ', e.text);
 
     assertEquals(0, e.startOffset);
@@ skipping 260 matching lines @@
     assertEquals(0, e1.startOffset);
     assertEquals(2, e1.endOffset);
 
     // Across paragraph selection with base line on anchor.
     e1 = new editing.EditableLine(thisIsATest, 5, hello, 2, true);
     assertEquals('is ', e1.text);
     assertEquals(0, e1.startOffset);
     assertEquals(3, e1.endOffset);
   })
 });