Make SurroundingText work for a Range.

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 "config.h"
 #include "core/editing/SurroundingText.h"
 
 #include "core/dom/Position.h"
 #include "core/dom/Range.h"
 #include "core/dom/Text.h"
@@ skipping 40 matching lines @@
 
 TEST_F(SurroundingTextTest, BasicCaretSelection)
 {
     setHTML(String("<p id='selection'>foo bar</p>"));
 
     {
         VisibleSelection selection = select(0);
         SurroundingText surroundingText(selection.start(), 1);
 
         EXPECT_EQ("f", surroundingText.content());
-        EXPECT_EQ(0u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(0u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(0u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(0);
         SurroundingText surroundingText(selection.start(), 5);
 
         // maxlength/2 is used on the left and right.
         EXPECT_EQ("foo", surroundingText.content().simplifyWhiteSpace());
-        EXPECT_EQ(1u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(0);
         SurroundingText surroundingText(selection.start(), 42);
 
         EXPECT_EQ("foo bar", surroundingText.content().simplifyWhiteSpace());
-        EXPECT_EQ(1u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.endOffsetInContent());
     }
 
     {
         // FIXME: if the selection is at the end of the text, SurroundingText
         // will return nothing.
         VisibleSelection selection = select(7);
         SurroundingText surroundingText(selection.start(), 42);
 
         EXPECT_EQ(0u, surroundingText.content().length());
-        EXPECT_EQ(0u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(0u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(0u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(6);
         SurroundingText surroundingText(selection.start(), 2);
 
         EXPECT_EQ("ar", surroundingText.content());
-        EXPECT_EQ(1u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(6);
         SurroundingText surroundingText(selection.start(), 42);
 
         EXPECT_EQ("foo bar", surroundingText.content().simplifyWhiteSpace());
-        EXPECT_EQ(7u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(7u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(7u, surroundingText.endOffsetInContent());
     }
 }
 
+TEST_F(SurroundingTextTest, BasicRangeSelection)
+{
+    setHTML(String("<p id='selection'>Lorem ipsum dolor sit amet</p>"));
+
+    {
+        VisibleSelection selection = select(0, 5);
+        SurroundingText surroundingText(*selection.firstRange(), 1);
+
+        EXPECT_EQ("Lorem ", surroundingText.content());
+        EXPECT_EQ(0u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(5u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(0, 5);
+        SurroundingText surroundingText(*selection.firstRange(), 5);
+
+        EXPECT_EQ("Lorem ip", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(6u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(0, 5);
+        SurroundingText surroundingText(*selection.firstRange(), 42);
+
+        EXPECT_EQ("Lorem ipsum dolor sit amet", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(6u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(6, 11);
+        SurroundingText surroundingText(*selection.firstRange(), 2);
+
+        EXPECT_EQ(" ipsum ", surroundingText.content());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(6u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(6, 11);
+        SurroundingText surroundingText(*selection.firstRange(), 42);
+
+        EXPECT_EQ("Lorem ipsum dolor sit amet", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(7u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(12u, surroundingText.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 surroundingText(selection.start(), 1);
 
         EXPECT_EQ("f", surroundingText.content());
-        EXPECT_EQ(0u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(0u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(0u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(0);
         SurroundingText surroundingText(selection.start(), 5);
 
         EXPECT_EQ("foo", surroundingText.content().simplifyWhiteSpace());
-        EXPECT_EQ(1u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(0);
         SurroundingText surroundingText(selection.start(), 1337);
 
         EXPECT_EQ("This is outside of foo bar the selected node", surroundingText.content().simplifyWhiteSpace());
-        EXPECT_EQ(20u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(20u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(20u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(6);
         SurroundingText surroundingText(selection.start(), 2);
 
         EXPECT_EQ("ar", surroundingText.content());
-        EXPECT_EQ(1u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.endOffsetInContent());
     }
 
     {
         VisibleSelection selection = select(6);
         SurroundingText surroundingText(selection.start(), 1337);
 
         EXPECT_EQ("This is outside of foo bar the selected node", surroundingText.content().simplifyWhiteSpace());
-        EXPECT_EQ(26u, surroundingText.positionOffsetInContent());
+        EXPECT_EQ(26u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(26u, surroundingText.endOffsetInContent());
     }
 }
 
+TEST_F(SurroundingTextTest, TreeRangeSelection)
+{
+    setHTML(String("<div>This is outside of <p id='selection'>foo bar</p> the selected node</div>"));
+
+    {
+        VisibleSelection selection = select(0, 1);
+        SurroundingText surroundingText(*selection.firstRange(), 1);
+
+        EXPECT_EQ("fo", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(0u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(1u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(0, 3);
+        SurroundingText surroundingText(*selection.firstRange(), 12);
+
+        EXPECT_EQ("e of foo bar", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(5u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(8u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(0, 3);
+        SurroundingText surroundingText(*selection.firstRange(), 1337);
+
+        EXPECT_EQ("This is outside of foo bar the selected node", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(20u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(23u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(4, 7);
+        SurroundingText surroundingText(*selection.firstRange(), 12);
+
+        EXPECT_EQ("foo bar the se", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(5u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(8u, surroundingText.endOffsetInContent());
+    }
+
+    {
+        VisibleSelection selection = select(0, 7);
+        SurroundingText surroundingText(*selection.firstRange(), 1337);
+
+        EXPECT_EQ("This is outside of foo bar the selected node", surroundingText.content().simplifyWhiteSpace());
+        EXPECT_EQ(20u, surroundingText.startOffsetInContent());
+        EXPECT_EQ(27u, surroundingText.endOffsetInContent());
+    }
+}
+
 } // anonymous namespace