Commit a946c51d authored by HyunJi Kim's avatar HyunJi Kim Committed by Commit Bot

Remove resolved TODO comment

It seems the job in TODO comment has been resolved.
So I think we can safely remove it.

Change-Id: Ic9d4b919e72373382f5da8828e5d890e9494b009
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297071Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: default avatarYoichi Osato <yoichio@chromium.org>
Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Hyunjune Kim <hyunjune.kim@samsung.com>
Cr-Commit-Position: refs/heads/master@{#789836}
parent 5c31d542
...@@ -387,6 +387,7 @@ HyeockJin Kim <kherootz@gmail.com> ...@@ -387,6 +387,7 @@ HyeockJin Kim <kherootz@gmail.com>
Hyungchan Kim <inlinechan@gmail.com> Hyungchan Kim <inlinechan@gmail.com>
Hyungwook Lee <hyungwook.lee@navercorp.com> Hyungwook Lee <hyungwook.lee@navercorp.com>
Hyungwook Lee <withlhw@gmail.com> Hyungwook Lee <withlhw@gmail.com>
HyunJi Kim <hjkim3323@gmail.com>
Hyunjun Shin <hyunjun.shin2@navercorp.com> Hyunjun Shin <hyunjun.shin2@navercorp.com>
Hyunjune Kim <hyunjune.kim@samsung.com> Hyunjune Kim <hyunjune.kim@samsung.com>
Hyunki Baik <hyunki.baik@samsung.com> Hyunki Baik <hyunki.baik@samsung.com>
......
...@@ -41,9 +41,9 @@ class IntPoint; ...@@ -41,9 +41,9 @@ class IntPoint;
class IntRect; class IntRect;
class LocalFrame; class LocalFrame;
// |WordSide| is used as a parameter of |StartOfWord()| and |EndOfWord()| // |WordSide| is used as a parameter of |StartOfWordPosition()| and
// to control a returning position when they are called for a position before // |EndOfWord()| to control a returning position when they are called for a
// word boundary. // position before word boundary.
enum WordSide { enum WordSide {
kNextWordIfOnBoundary = false, kNextWordIfOnBoundary = false,
kPreviousWordIfOnBoundary = true kPreviousWordIfOnBoundary = true
...@@ -114,18 +114,11 @@ PreviousPositionOf(const VisiblePositionInFlatTree&, ...@@ -114,18 +114,11 @@ PreviousPositionOf(const VisiblePositionInFlatTree&,
EditingBoundaryCrossingRule = kCanCrossEditingBoundary); EditingBoundaryCrossingRule = kCanCrossEditingBoundary);
// words // words
// TODO(yoichio): Replace |startOfWord| to |startOfWordPosition| because
// returned Position should be canonicalized with |previousBoundary()| by
// TextItetator.
CORE_EXPORT Position StartOfWordPosition(const Position&, CORE_EXPORT Position StartOfWordPosition(const Position&,
WordSide = kNextWordIfOnBoundary); WordSide = kNextWordIfOnBoundary);
CORE_EXPORT VisiblePosition StartOfWord(const VisiblePosition&,
WordSide = kNextWordIfOnBoundary);
CORE_EXPORT PositionInFlatTree CORE_EXPORT PositionInFlatTree
StartOfWordPosition(const PositionInFlatTree&, StartOfWordPosition(const PositionInFlatTree&,
WordSide = kNextWordIfOnBoundary); WordSide = kNextWordIfOnBoundary);
CORE_EXPORT VisiblePositionInFlatTree
StartOfWord(const VisiblePositionInFlatTree&, WordSide = kNextWordIfOnBoundary);
CORE_EXPORT VisiblePosition EndOfWord(const VisiblePosition&, CORE_EXPORT VisiblePosition EndOfWord(const VisiblePosition&,
WordSide = kNextWordIfOnBoundary); WordSide = kNextWordIfOnBoundary);
CORE_EXPORT Position EndOfWordPosition(const Position&, CORE_EXPORT Position EndOfWordPosition(const Position&,
......
...@@ -339,15 +339,4 @@ Position StartOfWordPosition(const Position& position, WordSide side) { ...@@ -339,15 +339,4 @@ Position StartOfWordPosition(const Position& position, WordSide side) {
StartOfWordPosition(ToPositionInFlatTree(position), side)); StartOfWordPosition(ToPositionInFlatTree(position), side));
} }
VisiblePosition StartOfWord(const VisiblePosition& position, WordSide side) {
return CreateVisiblePosition(
StartOfWordPosition(position.DeepEquivalent(), side));
}
VisiblePositionInFlatTree StartOfWord(const VisiblePositionInFlatTree& position,
WordSide side) {
return CreateVisiblePosition(
StartOfWordPosition(position.DeepEquivalent(), side));
}
} // namespace blink } // namespace blink
...@@ -17,9 +17,7 @@ class VisibleUnitsWordTest : public EditingTestBase { ...@@ -17,9 +17,7 @@ class VisibleUnitsWordTest : public EditingTestBase {
const std::string& selection_text, const std::string& selection_text,
WordSide word_side = WordSide::kNextWordIfOnBoundary) { WordSide word_side = WordSide::kNextWordIfOnBoundary) {
const Position position = SetSelectionTextToBody(selection_text).Base(); const Position position = SetSelectionTextToBody(selection_text).Base();
return GetCaretTextFromBody( return GetCaretTextFromBody(StartOfWordPosition(position, word_side));
StartOfWord(CreateVisiblePosition(position), word_side)
.DeepEquivalent());
} }
std::string DoEndOfWord( std::string DoEndOfWord(
...@@ -194,60 +192,85 @@ TEST_P(ParameterizedVisibleUnitsWordTest, StartOfWordShadowDOM) { ...@@ -194,60 +192,85 @@ TEST_P(ParameterizedVisibleUnitsWordTest, StartOfWordShadowDOM) {
Node* five = shadow_root->getElementById("five")->firstChild(); Node* five = shadow_root->getElementById("five")->firstChild();
Node* space = shadow_root->getElementById("space")->firstChild(); Node* space = shadow_root->getElementById("space")->firstChild();
EXPECT_EQ( EXPECT_EQ(Position(one, 0),
Position(one, 0), CreateVisiblePosition(
StartOfWord(CreateVisiblePositionInDOMTree(*one, 0)).DeepEquivalent()); StartOfWordPosition(
EXPECT_EQ( CreateVisiblePositionInDOMTree(*one, 0).DeepEquivalent()))
PositionInFlatTree(space, 1), .DeepEquivalent());
StartOfWord(CreateVisiblePositionInFlatTree(*one, 0)).DeepEquivalent()); EXPECT_EQ(PositionInFlatTree(space, 1),
CreateVisiblePosition(
EXPECT_EQ( StartOfWordPosition(
Position(one, 0), CreateVisiblePositionInFlatTree(*one, 0).DeepEquivalent()))
StartOfWord(CreateVisiblePositionInDOMTree(*one, 1)).DeepEquivalent()); .DeepEquivalent());
EXPECT_EQ( EXPECT_EQ(Position(one, 0),
PositionInFlatTree(space, 1), CreateVisiblePosition(
StartOfWord(CreateVisiblePositionInFlatTree(*one, 1)).DeepEquivalent()); StartOfWordPosition(
CreateVisiblePositionInDOMTree(*one, 1).DeepEquivalent()))
EXPECT_EQ( .DeepEquivalent());
Position(one, 0),
StartOfWord(CreateVisiblePositionInDOMTree(*two, 0)).DeepEquivalent()); EXPECT_EQ(PositionInFlatTree(space, 1),
EXPECT_EQ( CreateVisiblePosition(
PositionInFlatTree(four, 0), StartOfWordPosition(
StartOfWord(CreateVisiblePositionInFlatTree(*two, 0)).DeepEquivalent()); CreateVisiblePositionInFlatTree(*one, 1).DeepEquivalent()))
.DeepEquivalent());
EXPECT_EQ( EXPECT_EQ(Position(one, 0),
Position(four, 0), CreateVisiblePosition(
StartOfWord(CreateVisiblePositionInDOMTree(*two, 1)).DeepEquivalent()); StartOfWordPosition(
EXPECT_EQ( CreateVisiblePositionInDOMTree(*two, 0).DeepEquivalent()))
PositionInFlatTree(four, 0), .DeepEquivalent());
StartOfWord(CreateVisiblePositionInFlatTree(*two, 1)).DeepEquivalent()); EXPECT_EQ(PositionInFlatTree(four, 0),
CreateVisiblePosition(
StartOfWordPosition(
CreateVisiblePositionInFlatTree(*two, 0).DeepEquivalent()))
.DeepEquivalent());
EXPECT_EQ(Position(four, 0),
CreateVisiblePosition(
StartOfWordPosition(
CreateVisiblePositionInDOMTree(*two, 1).DeepEquivalent()))
.DeepEquivalent());
EXPECT_EQ(PositionInFlatTree(four, 0),
CreateVisiblePosition(
StartOfWordPosition(
CreateVisiblePositionInFlatTree(*two, 1).DeepEquivalent()))
.DeepEquivalent());
// DOM tree canonicalization moves the result to a wrong position. // DOM tree canonicalization moves the result to a wrong position.
EXPECT_EQ( EXPECT_EQ(Position(two, 2),
Position(two, 2), CreateVisiblePosition(
StartOfWord(CreateVisiblePositionInDOMTree(*three, 1)).DeepEquivalent()); StartOfWordPosition(
CreateVisiblePositionInDOMTree(*three, 1).DeepEquivalent()))
.DeepEquivalent());
EXPECT_EQ( EXPECT_EQ(
PositionInFlatTree(three, 0), PositionInFlatTree(three, 0),
StartOfWord(CreateVisiblePositionInFlatTree(*three, 1)).DeepEquivalent()); CreateVisiblePosition(
StartOfWordPosition(
EXPECT_EQ( CreateVisiblePositionInFlatTree(*three, 1).DeepEquivalent()))
Position(four, 0), .DeepEquivalent());
StartOfWord(CreateVisiblePositionInDOMTree(*four, 1)).DeepEquivalent()); EXPECT_EQ(Position(four, 0),
EXPECT_EQ( CreateVisiblePosition(
PositionInFlatTree(four, 0), StartOfWordPosition(
StartOfWord(CreateVisiblePositionInFlatTree(*four, 1)).DeepEquivalent()); CreateVisiblePositionInDOMTree(*four, 1).DeepEquivalent()))
.DeepEquivalent());
EXPECT_EQ( EXPECT_EQ(PositionInFlatTree(four, 0),
Position(one, 0), CreateVisiblePosition(
StartOfWord(CreateVisiblePositionInDOMTree(*five, 1)).DeepEquivalent()); StartOfWordPosition(
CreateVisiblePositionInFlatTree(*four, 1).DeepEquivalent()))
.DeepEquivalent());
EXPECT_EQ(Position(one, 0),
CreateVisiblePosition(
StartOfWordPosition(
CreateVisiblePositionInDOMTree(*five, 1).DeepEquivalent()))
.DeepEquivalent());
// Flat tree canonicalization moves result to downstream position // Flat tree canonicalization moves result to downstream position
EXPECT_EQ( EXPECT_EQ(PositionInFlatTree(space, 1),
PositionInFlatTree(space, 1), CreateVisiblePosition(
StartOfWord(CreateVisiblePositionInFlatTree(*five, 1)).DeepEquivalent()); StartOfWordPosition(
CreateVisiblePositionInFlatTree(*five, 1).DeepEquivalent()))
.DeepEquivalent());
} }
TEST_P(ParameterizedVisibleUnitsWordTest, StartOfWordTextSecurity) { TEST_P(ParameterizedVisibleUnitsWordTest, StartOfWordTextSecurity) {
// Note: |StartOfWord()| considers security characters as a sequence "x". // Note: |StartOfWordPosition()| considers security characters
// as a sequence "x".
InsertStyleElement("s {-webkit-text-security:disc;}"); InsertStyleElement("s {-webkit-text-security:disc;}");
EXPECT_EQ("|abc<s>foo bar</s>baz", DoStartOfWord("|abc<s>foo bar</s>baz")); EXPECT_EQ("|abc<s>foo bar</s>baz", DoStartOfWord("|abc<s>foo bar</s>baz"));
EXPECT_EQ("|abc<s>foo bar</s>baz", DoStartOfWord("abc|<s>foo bar</s>baz")); EXPECT_EQ("|abc<s>foo bar</s>baz", DoStartOfWord("abc|<s>foo bar</s>baz"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment