Reland: Made surrounding text work for last word in a document

third_party/WebKit/Source/core/editing/SurroundingTextTest.cpp

 // Copyright 2014 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 "core/editing/SurroundingText.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/Range.h"
 #include "core/dom/Text.h"
@@ skipping 62 matching lines @@
   {
     VisibleSelection selection = Select(0);
     SurroundingText surrounding_text(selection.Start(), 42);
 
     EXPECT_EQ("foo bar", surrounding_text.Content().SimplifyWhiteSpace());
     EXPECT_EQ(1u, surrounding_text.StartOffsetInContent());
     EXPECT_EQ(1u, surrounding_text.EndOffsetInContent());
   }
 
   {
-    // FIXME: if the selection is at the end of the text, SurroundingText
-    // will return nothing.
     VisibleSelection selection = Select(7);
     SurroundingText surrounding_text(selection.Start(), 42);
 
-    EXPECT_EQ(0u, surrounding_text.Content().length());
-    EXPECT_EQ(0u, surrounding_text.StartOffsetInContent());
-    EXPECT_EQ(0u, surrounding_text.EndOffsetInContent());
+    EXPECT_EQ("foo bar", surrounding_text.Content().SimplifyWhiteSpace());
+    EXPECT_EQ(8u, surrounding_text.StartOffsetInContent());
+    EXPECT_EQ(8u, surrounding_text.EndOffsetInContent());
   }
 
   {
     VisibleSelection selection = Select(6);
     SurroundingText surrounding_text(selection.Start(), 2);
 
     EXPECT_EQ("ar", surrounding_text.Content());
     EXPECT_EQ(1u, surrounding_text.StartOffsetInContent());
     EXPECT_EQ(1u, surrounding_text.EndOffsetInContent());
   }
@@ skipping 55 matching lines @@
   {
     VisibleSelection selection = Select(6, 11);
     SurroundingText surrounding_text(
         *CreateRange(FirstEphemeralRangeOf(selection)), 42);
 
     EXPECT_EQ("Lorem ipsum dolor sit amet",
               surrounding_text.Content().SimplifyWhiteSpace());
     EXPECT_EQ(7u, surrounding_text.StartOffsetInContent());
     EXPECT_EQ(12u, surrounding_text.EndOffsetInContent());
   }
+
+  {
+    // Last word.
+    VisibleSelection selection = Select(22, 26);
+    SurroundingText surrounding_text(
+        *CreateRange(FirstEphemeralRangeOf(selection)), 8);
+
+    EXPECT_EQ("sit amet", surrounding_text.Content());
+    EXPECT_EQ(4u, surrounding_text.StartOffsetInContent());
+    EXPECT_EQ(8u, surrounding_text.EndOffsetInContent());
+  }
 }
 
 TEST_F(SurroundingTextTest, TreeCaretSelection) {
   SetHTML(
       String("<div>This is outside of <p id='selection'>foo bar</p> the "
              "selected node</div>"));
 
   {
     VisibleSelection selection = Select(0);
     SurroundingText surrounding_text(selection.Start(), 1);
@@ skipping 115 matching lines @@
 
   SurroundingText surrounding_text(
       *CreateRange(FirstEphemeralRangeOf(selection)), 20);
 
   EXPECT_EQ("abc def ghi", surrounding_text.Content().SimplifyWhiteSpace());
   EXPECT_EQ(4u, surrounding_text.StartOffsetInContent());
   EXPECT_EQ(7u, surrounding_text.EndOffsetInContent());
 }
 
 }  // namespace blink