| Index: third_party/WebKit/Source/core/style/ComputedStyleTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp b/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp
|
| index 10e0975641ae1f20c9788db0daf98c480fa4e760..392e89efb15b932da72d33dd1af78b9b7ffedf92 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp
|
| @@ -47,7 +47,7 @@ TEST(ComputedStyleTest, FocusRingWidth) {
|
| RefPtr<ComputedStyle> style = ComputedStyle::Create();
|
| style->SetEffectiveZoom(3.5);
|
| #if OS(MACOSX)
|
| - style->SetOutlineStyle(kBorderStyleSolid);
|
| + style->SetOutlineStyle(EBorderStyle::kSolid);
|
| ASSERT_EQ(3, style->GetOutlineStrokeWidthForFocusRing());
|
| #else
|
| ASSERT_EQ(3.5, style->GetOutlineStrokeWidthForFocusRing());
|
| @@ -58,7 +58,7 @@ TEST(ComputedStyleTest, FocusRingWidth) {
|
|
|
| TEST(ComputedStyleTest, FocusRingOutset) {
|
| RefPtr<ComputedStyle> style = ComputedStyle::Create();
|
| - style->SetOutlineStyle(kBorderStyleSolid);
|
| + style->SetOutlineStyle(EBorderStyle::kSolid);
|
| style->SetOutlineStyleIsAuto(kOutlineIsAutoOn);
|
| style->SetEffectiveZoom(4.75);
|
| #if OS(MACOSX)
|
| @@ -110,7 +110,7 @@ TEST(CompuetedStyleTest, HasOutlineWithCurrentColor) {
|
| EXPECT_FALSE(style->HasOutlineWithCurrentColor());
|
| style->SetOutlineWidth(5);
|
| EXPECT_FALSE(style->HasOutlineWithCurrentColor());
|
| - style->SetOutlineStyle(kBorderStyleSolid);
|
| + style->SetOutlineStyle(EBorderStyle::kSolid);
|
| EXPECT_TRUE(style->HasOutlineWithCurrentColor());
|
| }
|
|
|
| @@ -121,7 +121,7 @@ TEST(CompuetedStyleTest, HasBorderColorReferencingCurrentColor) {
|
| EXPECT_FALSE(style->HasBorderColorReferencingCurrentColor());
|
| style->SetBorderBottomWidth(5);
|
| EXPECT_FALSE(style->HasBorderColorReferencingCurrentColor());
|
| - style->SetBorderBottomStyle(kBorderStyleSolid);
|
| + style->SetBorderBottomStyle(EBorderStyle::kSolid);
|
| EXPECT_TRUE(style->HasBorderColorReferencingCurrentColor());
|
| }
|
|
|
|
|