Make EndOfSentence stop at block boundaries

This patch stops EndOfSentence from crossing block boundaries, since block boundaries are also sentence boundaries. Bug: 778507 Change-Id: I19ec97de1bbaac50db4c55b38ffb158339003993 Reviewed-on: https://chromium-review.googlesource.com/c/1337432Reviewed-by: Yoichi Osato <yoichio@chromium.org> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org> Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org> Cr-Commit-Position: refs/heads/master@{#608850}

Make EndOfSentence stop at block boundaries
This patch stops EndOfSentence from crossing block boundaries, since block boundaries are also sentence boundaries. Bug: 778507 Change-Id: I19ec97de1bbaac50db4c55b38ffb158339003993 Reviewed-on: https://chromium-review.googlesource.com/c/1337432Reviewed-by: Yoichi Osato <yoichio@chromium.org> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org> Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org> Cr-Commit-Position: refs/heads/master@{#608850}
aee1ee31 · Xiaocheng Hu · Commit Bot · 390c941f · aee1ee31 · aee1ee31
Commit aee1ee31 authored Nov 16, 2018 by Xiaocheng Hu Committed by Commit Bot Nov 16, 2018
2 changed files
--- a/third_party/WebKit/LayoutTests/fast/dom/Range/range-expand.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Range/range-expand.html
@@ -85,6 +85,14 @@ function runTests() {
    assert_equals(actual, 'multiple lines.');
  }, 'sentence11');

+  // Sentence end expansion should not cross block boundaries.
+  test(() => {
+    const id = 'begin';
+    const length = document.getElementById(id).firstChild.length;
+    const actual = expandRangeString(id, length, id, length, 'sentence', true);
+    assert_equals(actual, 'Each sentence begins with capital\nletter and ends with a punctuation.');
+  }, 'sentence12');
+
  // Expand word.
  // Same range start and end, both at the begin of word.
  test(() => {
@@ -218,7 +226,7 @@ function runTests() {
 }
 </script>
 <body>
-<p>This is the begin of a block. A block is a collection of sentences. Each sentence begins with capital
+<p id="begin">This is the begin of a block. A block is a collection of sentences. Each sentence begins with capital
 letter and ends with a punctuation.
 </p>
 <pre id="multilineSentence">Now, a sentence

--- a/third_party/blink/renderer/core/editing/visible_units_sentence.cc
+++ b/third_party/blink/renderer/core/editing/visible_units_sentence.cc
@@ -103,8 +103,13 @@ PositionInFlatTree EndOfSentenceInternal(const PositionInFlatTree& position) {
      // between sentences.
      const unsigned offset = FindNonSpaceCharacter(text, passed_offset);
      const int result = iterator->following(offset);
-      if (result == kTextBreakDone)
+      if (result == kTextBreakDone) {
+        if (text.length()) {
+          // Block boundaries are also sentence boundaries.
+          return Position::After(text.length());
+        }
        return Position();
+      }
      return result == 0 ? Position::Before(0) : Position::After(result - 1);
    }