Commit 19ad180b authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot

Get rid of extra namespace for jumbo build from VisibleUnitsWordTest.cpp

This patch gets rid of extra namespace for jumbo build from
"VisibleUnitsWordTest.cpp" to simplify source code for improving code health.

[1] http://crrev.com/c/923723  [jumbo] avoid helper function collisions in
VisibleUnits*Test.cpp

Change-Id: I35e5f45f458e370000aeaf8f161e26c76f7f5152
Reviewed-on: https://chromium-review.googlesource.com/925922Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537716}
parent e0c8c60f
...@@ -9,21 +9,6 @@ ...@@ -9,21 +9,6 @@
#include "core/editing/testing/EditingTestBase.h" #include "core/editing/testing/EditingTestBase.h"
namespace blink { namespace blink {
namespace visible_units_word_test {
VisiblePosition CreateVisiblePositionInDOMTree(
Node& anchor,
int offset,
TextAffinity affinity = TextAffinity::kDownstream) {
return CreateVisiblePosition(Position(&anchor, offset), affinity);
}
VisiblePositionInFlatTree CreateVisiblePositionInFlatTree(
Node& anchor,
int offset,
TextAffinity affinity = TextAffinity::kDownstream) {
return CreateVisiblePosition(PositionInFlatTree(&anchor, offset), affinity);
}
class VisibleUnitsWordTest : public EditingTestBase { class VisibleUnitsWordTest : public EditingTestBase {
protected: protected:
...@@ -67,6 +52,21 @@ class VisibleUnitsWordTest : public EditingTestBase { ...@@ -67,6 +52,21 @@ class VisibleUnitsWordTest : public EditingTestBase {
return GetSelectionTextFromBody( return GetSelectionTextFromBody(
SelectionInDOMTree::Builder().Collapse(result).Build()); SelectionInDOMTree::Builder().Collapse(result).Build());
} }
// To avoid name conflict in jumbo build, following functions should be here.
static VisiblePosition CreateVisiblePositionInDOMTree(
Node& anchor,
int offset,
TextAffinity affinity = TextAffinity::kDownstream) {
return CreateVisiblePosition(Position(&anchor, offset), affinity);
}
static VisiblePositionInFlatTree CreateVisiblePositionInFlatTree(
Node& anchor,
int offset,
TextAffinity affinity = TextAffinity::kDownstream) {
return CreateVisiblePosition(PositionInFlatTree(&anchor, offset), affinity);
}
}; };
TEST_F(VisibleUnitsWordTest, StartOfWordBasic) { TEST_F(VisibleUnitsWordTest, StartOfWordBasic) {
...@@ -461,5 +461,4 @@ TEST_F(VisibleUnitsWordTest, PreviousWordBasic) { ...@@ -461,5 +461,4 @@ TEST_F(VisibleUnitsWordTest, PreviousWordBasic) {
EXPECT_EQ("<p> (1) abc |def</p>", DoPreviousWord("<p> (1) abc def</p>|")); EXPECT_EQ("<p> (1) abc |def</p>", DoPreviousWord("<p> (1) abc def</p>|"));
} }
} // namespace visible_units_word_test
} // namespace blink } // namespace blink
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