Rename NGOffsetMappingResult::IsNonCollapsedCharacter to IsBeforeNonCollapsedCharacter

Bug: 699017
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: I0ad635a08ffed1fdca4e370a320e12854e2ef227
Reviewed-on: https://chromium-review.googlesource.com/727406
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510140}

third_party/WebKit/Source/core/editing/commands/EditCommand.cpp

@@ -70,7 +70,7 @@ bool EditCommand::IsRenderedCharacter(const Position& position) {
   // Use NG offset mapping when LayoutNG is enabled.
   if (const NGOffsetMappingResult* mapping =
           GetNGOffsetMappingFor(node, offset_in_node)) {
-    return mapping->IsNonCollapsedCharacter(node, offset_in_node);
+    return mapping->IsBeforeNonCollapsedCharacter(node, offset_in_node);
   }
 
   // TODO(editing-dev): This doesn't handle first-letter correctly. Fix it.

third_party/WebKit/Source/core/layout/LayoutText.cpp

@@ -1999,7 +1999,7 @@ bool LayoutText::ContainsCaretOffset(int text_offset) const {
     if (!GetNode())
       return false;
     const NGOffsetMappingResult& mapping = GetNGOffsetMapping();
-    if (mapping.IsNonCollapsedCharacter(*GetNode(), text_offset))
+    if (mapping.IsBeforeNonCollapsedCharacter(*GetNode(), text_offset))
       return true;
     if (!mapping.IsAfterNonCollapsedCharacter(*GetNode(), text_offset))
       return false;

third_party/WebKit/Source/core/layout/LayoutTextFragment.cpp

@@ -234,7 +234,7 @@ bool LayoutTextFragment::ContainsCaretOffset(int text_offset) const {
     return false;
   const unsigned dom_offset = text_offset + Start();
   const NGOffsetMappingResult& mapping = GetNGOffsetMapping();
-  if (mapping.IsNonCollapsedCharacter(*node, dom_offset))
+  if (mapping.IsBeforeNonCollapsedCharacter(*node, dom_offset))
     return true;
   if (text_offset == 0)
     return false;

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_offset_mapping_test.cc

@@ -68,8 +68,8 @@ class NGInlineNodeOffsetMappingTest : public RenderingTest {
     return GetOffsetMapping().EndOfLastNonCollapsedCharacter(node, offset);
   }
 
-  bool IsNonCollapsedCharacter(const Node& node, unsigned offset) const {
-    return GetOffsetMapping().IsNonCollapsedCharacter(node, offset);
+  bool IsBeforeNonCollapsedCharacter(const Node& node, unsigned offset) const {
+    return GetOffsetMapping().IsBeforeNonCollapsedCharacter(node, offset);
   }
 
   bool IsAfterNonCollapsedCharacter(const Node& node, unsigned offset) const {
@@ -155,10 +155,11 @@ TEST_F(NGInlineNodeOffsetMappingTest, OneTextNode) {
   EXPECT_EQ(2u, EndOfLastNonCollapsedCharacter(*foo_node, 2));
   EXPECT_EQ(3u, EndOfLastNonCollapsedCharacter(*foo_node, 3));
 
-  EXPECT_TRUE(IsNonCollapsedCharacter(*foo_node, 0));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*foo_node, 1));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*foo_node, 2));
-  EXPECT_FALSE(IsNonCollapsedCharacter(*foo_node, 3));  // false at node end
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*foo_node, 0));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*foo_node, 1));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*foo_node, 2));
+  EXPECT_FALSE(
+      IsBeforeNonCollapsedCharacter(*foo_node, 3));  // false at node end
 
   // false at node start
   EXPECT_FALSE(IsAfterNonCollapsedCharacter(*foo_node, 0));
@@ -205,15 +206,17 @@ TEST_F(NGInlineNodeOffsetMappingTest, TwoTextNodes) {
   EXPECT_EQ(5u, GetTextContentOffset(*bar_node, 2));
   EXPECT_EQ(6u, GetTextContentOffset(*bar_node, 3));
 
-  EXPECT_TRUE(IsNonCollapsedCharacter(*foo_node, 0));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*foo_node, 1));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*foo_node, 2));
-  EXPECT_FALSE(IsNonCollapsedCharacter(*foo_node, 3));  // false at node end
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*foo_node, 0));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*foo_node, 1));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*foo_node, 2));
+  EXPECT_FALSE(
+      IsBeforeNonCollapsedCharacter(*foo_node, 3));  // false at node end
 
-  EXPECT_TRUE(IsNonCollapsedCharacter(*bar_node, 0));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*bar_node, 1));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*bar_node, 2));
-  EXPECT_FALSE(IsNonCollapsedCharacter(*bar_node, 3));  // false at node end
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*bar_node, 0));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*bar_node, 1));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*bar_node, 2));
+  EXPECT_FALSE(
+      IsBeforeNonCollapsedCharacter(*bar_node, 3));  // false at node end
 
   // false at node start
   EXPECT_FALSE(IsAfterNonCollapsedCharacter(*foo_node, 0));
@@ -318,15 +321,15 @@ TEST_F(NGInlineNodeOffsetMappingTest, OneTextNodeWithCollapsedSpace) {
   EXPECT_EQ(4u, EndOfLastNonCollapsedCharacter(*node, 4));
   EXPECT_EQ(4u, EndOfLastNonCollapsedCharacter(*node, 5));
 
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 0));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 1));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 2));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 3));
-  EXPECT_FALSE(IsNonCollapsedCharacter(*node, 4));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 5));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 6));
-  EXPECT_TRUE(IsNonCollapsedCharacter(*node, 7));
-  EXPECT_FALSE(IsNonCollapsedCharacter(*node, 8));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 0));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 1));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 2));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 3));
+  EXPECT_FALSE(IsBeforeNonCollapsedCharacter(*node, 4));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 5));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 6));
+  EXPECT_TRUE(IsBeforeNonCollapsedCharacter(*node, 7));
+  EXPECT_FALSE(IsBeforeNonCollapsedCharacter(*node, 8));
 
   EXPECT_FALSE(IsAfterNonCollapsedCharacter(*node, 0));
   EXPECT_TRUE(IsAfterNonCollapsedCharacter(*node, 1));

third_party/WebKit/Source/core/layout/ng/inline/ng_offset_mapping_result.cc

@@ -165,8 +165,9 @@ unsigned NGOffsetMappingResult::EndOfLastNonCollapsedCharacter(
   return fallback;
 }
 
-bool NGOffsetMappingResult::IsNonCollapsedCharacter(const Node& node,
-                                                    unsigned offset) const {
+bool NGOffsetMappingResult::IsBeforeNonCollapsedCharacter(
+    const Node& node,
+    unsigned offset) const {
   const NGOffsetMappingUnit* unit = GetMappingUnitForDOMOffset(node, offset);
   return unit && offset < unit->DOMEnd() &&
          unit->GetType() != NGOffsetMappingUnitType::kCollapsed;

third_party/WebKit/Source/core/layout/ng/inline/ng_offset_mapping_result.h

@@ -126,10 +126,9 @@ class CORE_EXPORT NGOffsetMappingResult {
   // TODO(xiaochengh): Use Optional<> return type to indicate inexistent result.
   unsigned EndOfLastNonCollapsedCharacter(const Node&, unsigned offset) const;
 
-  // Returns true if the character at the position is non-collapsed. If the
-  // offset is at the end of the node, returns false.
-  // TODO(xiaochengh): Rename to IsBeforeNonCollapsedCharacter().
-  bool IsNonCollapsedCharacter(const Node&, unsigned offset) const;
+  // Returns true if the offset is right before a non-collapsed character. If
+  // the offset is at the end of the node, returns false.
+  bool IsBeforeNonCollapsedCharacter(const Node&, unsigned offset) const;
 
   // Returns true if the offset is right after a non-collapsed character. If the
   // offset is at the beginning of the node, returns false.