| Index: third_party/WebKit/Source/core/editing/markers/CompositionMarkerTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/markers/CompositionMarkerTest.cpp b/third_party/WebKit/Source/core/editing/markers/CompositionMarkerTest.cpp
|
| index 3db1f7ebd699ff6512ea7a232a377460cc2ea8a3..f54a0dc84b8f414d9b86858cc7f3738ae8d11b62 100644
|
| --- a/third_party/WebKit/Source/core/editing/markers/CompositionMarkerTest.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/markers/CompositionMarkerTest.cpp
|
| @@ -12,22 +12,20 @@ class CompositionMarkerTest : public ::testing::Test {};
|
|
|
| TEST_F(CompositionMarkerTest, MarkerType) {
|
| DocumentMarker* marker = new CompositionMarker(
|
| - 0, 1, Color::kTransparent, CompositionMarker::Thickness::kThin,
|
| + 0, 1, Color::kTransparent, StyleableMarker::Thickness::kThin,
|
| Color::kTransparent);
|
| EXPECT_EQ(DocumentMarker::kComposition, marker->GetType());
|
| }
|
|
|
| TEST_F(CompositionMarkerTest, ConstructorAndGetters) {
|
| - CompositionMarker* marker =
|
| - new CompositionMarker(0, 1, Color::kDarkGray,
|
| - CompositionMarker::Thickness::kThin, Color::kGray);
|
| + CompositionMarker* marker = new CompositionMarker(
|
| + 0, 1, Color::kDarkGray, StyleableMarker::Thickness::kThin, Color::kGray);
|
| EXPECT_EQ(Color::kDarkGray, marker->UnderlineColor());
|
| EXPECT_FALSE(marker->IsThick());
|
| EXPECT_EQ(Color::kGray, marker->BackgroundColor());
|
|
|
| - CompositionMarker* thick_marker =
|
| - new CompositionMarker(0, 1, Color::kDarkGray,
|
| - CompositionMarker::Thickness::kThick, Color::kGray);
|
| + CompositionMarker* thick_marker = new CompositionMarker(
|
| + 0, 1, Color::kDarkGray, StyleableMarker::Thickness::kThick, Color::kGray);
|
| EXPECT_EQ(true, thick_marker->IsThick());
|
| }
|
|
|
|
|