Make InlineBoxPosition constructor not to accept null-InlineBox

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

Index: third_party/WebKit/Source/core/editing/VisibleUnits.cpp
diff --git a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
index 10d7bb2428cb8dcae515df30e6b47cfe308179ee..08c3462237bd52ecc1c70907d5966e15fabd6509 100644
--- a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
+++ b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
@@ -790,15 +790,17 @@ static InlineBoxPosition ComputeInlineBoxPositionTemplate(
           UpstreamIgnoringEditingBoundaries(position);
       if (upstream_equivalent == position ||
           DownstreamIgnoringEditingBoundaries(upstream_equivalent) == position)
-        return InlineBoxPosition(inline_box, caret_offset);
+        return InlineBoxPosition();
 
       return ComputeInlineBoxPosition(
           upstream_equivalent, TextAffinity::kUpstream, primary_direction);
     }
     if (layout_object->IsBox()) {
       inline_box = ToLayoutBox(layout_object)->InlineBoxWrapper();
-      if (!inline_box || (caret_offset > inline_box->CaretMinOffset() &&
-                          caret_offset < inline_box->CaretMaxOffset()))
+      if (!inline_box)
+        return InlineBoxPosition();
+      if ((caret_offset > inline_box->CaretMinOffset() &&
+           caret_offset < inline_box->CaretMaxOffset()))
         return InlineBoxPosition(inline_box, caret_offset);
     }
   } else {
@@ -840,7 +842,7 @@ static InlineBoxPosition ComputeInlineBoxPositionTemplate(
   }
 
   if (!inline_box)
-    return InlineBoxPosition(inline_box, caret_offset);
+    return InlineBoxPosition();
   return AdjustInlineBoxPositionForTextDirection(
       inline_box, caret_offset, layout_object->Style()->GetUnicodeBidi(),
       primary_direction);
@@ -1024,7 +1026,11 @@ LocalCaretRect LocalCaretRectOfPositionTemplate(
             box_position.inline_box->GetLineLayoutItem()),
         box_position);
   }
-  return ComputeLocalCaretRect(layout_object, box_position);
+  // DeleteSelectionCommandTest.deleteListFromTable goes here.
+  return LocalCaretRect(
+      layout_object,
+      layout_object->LocalCaretRect(
+          nullptr, position.GetPosition().ComputeEditingOffset()));

[Xiaocheng, 2017/06/12 18:53:41]

Could you clarify this change?

We should have |box_position.offset_in_box == 0| here. Why can't we use 0 offset
here, but have to use ComputeEditingOffset() instead?

[yosin_UTC9, 2017/06/13 06:55:00]

Before this patch, we have box_positon.layout_object = nullptr and offset_in_box
= position.ComputeEditingOffset(), which is
in ComputeInlineBoxPositionTempalte() as int caret_offset =
position.ComputeEditingOffset() at L764.

After this patch, we ComputeInlineBox() returns |.offset_in_box == 0| for
|.layoyut_object == nullptr|, hence we need to
pass |.ComputeEditingOffset()| to |LayoutObject::LocalCaret()|.

I added an explanation to description.

[Xiaocheng, 2017/06/13 17:25:03]

Thanks!

 }
 
 // This function was added because the caret rect that is calculated by