ALL-IN-ONE: Refactor ComputeInlineBoxPosition()

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

 // Copyright 2015 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/VisibleUnits.h"
 
 #include <ostream>  // NOLINT
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/dom/Text.h"
 #include "core/editing/EditingTestBase.h"
@@ skipping 285 matching lines @@
 // http://crbug.com/716093
 TEST_F(VisibleUnitsTest, ComputeInlineBoxPositionMixedEditable) {
   SetBodyContent(
       "<div contenteditable id=sample>abc<input contenteditable=false></div>");
   Element* const sample = GetDocument().getElementById("sample");
 
   const InlineBoxPosition& actual = ComputeInlineBoxPosition(
       Position::LastPositionInNode(sample), TextAffinity::kDownstream);
   // Should not be in infinite-loop
   EXPECT_EQ(nullptr, actual.inline_box);
-  // TODO(editing-dev): We should return 0 for |InlineBoxPosition| when
-  // |inline_box| is null.
-  EXPECT_EQ(2, actual.offset_in_box);

[Xiaocheng, 2017/06/08 21:34:12]

This is behavioral change.

[yosin_UTC9, 2017/06/09 01:55:55]

This comes from here:

ORIGINAL:
      inline_box = ToLayoutBox(layout_object)->InlineBoxWrapper();
      if (!inline_box || (caret_offset > inline_box->CaretMinOffset() &&
                          caret_offset < inline_box->CaretMaxOffset()))
        return InlineBoxPosition(inline_box, caret_offset);

     if (!inline_box)
        return InlineBoxPosition(inline_box, caret_offset);

Anyway, I'll move this change into another patch.

+  EXPECT_EQ(0, actual.offset_in_box);
 }
 
 TEST_F(VisibleUnitsTest, endOfDocument) {
   const char* body_content = "<a id=host><b id=one>1</b><b id=two>22</b></a>";
   const char* shadow_content =
       "<p><content select=#two></content></p><p><content "
       "select=#one></content></p>";
   SetBodyContent(body_content);
   SetShadowContent(shadow_content, "host");
 
@@ skipping 1670 matching lines @@
        canonicalizationWithCollapsedSpaceAndIsolatedCombiningCharacter) {
   SetBodyContent("<p>  &#x20E3;</p>");  // Leading space is necessary
 
   Node* paragraph = GetDocument().QuerySelector("p");
   Node* text = paragraph->firstChild();
   Position start = CanonicalPositionOf(Position::BeforeNode(paragraph));
   EXPECT_EQ(Position(text, 2), start);
 }
 
 }  // namespace blink