| Index: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
|
| index 5f166ce455a72e90f091994cfc8a17e8959706ca..3140862f2d8c29526847378773c6646bb06b8f87 100644
|
| --- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
|
| @@ -1132,11 +1132,6 @@ TEST_P(NonCompositedMainThreadScrollingReasonTest, BackgroundNotOpaqueTest) {
|
| MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText);
|
| }
|
|
|
| -TEST_P(NonCompositedMainThreadScrollingReasonTest, BorderRadiusTest) {
|
| - TestNonCompositedReasons("border-radius",
|
| - MainThreadScrollingReason::kHasBorderRadius);
|
| -}
|
| -
|
| TEST_P(NonCompositedMainThreadScrollingReasonTest, ClipTest) {
|
| TestNonCompositedReasons("clip",
|
| MainThreadScrollingReason::kHasClipRelatedProperty);
|
| @@ -1192,9 +1187,8 @@ TEST_P(NonCompositedMainThreadScrollingReasonTest, ClipPathTest) {
|
| }
|
|
|
| TEST_P(NonCompositedMainThreadScrollingReasonTest, LCDTextEnabledTest) {
|
| - TestNonCompositedReasons("transparent border-radius",
|
| - MainThreadScrollingReason::kHasOpacityAndLCDText |
|
| - MainThreadScrollingReason::kHasBorderRadius);
|
| + TestNonCompositedReasons("transparent",
|
| + MainThreadScrollingReason::kHasOpacityAndLCDText);
|
| }
|
|
|
| TEST_P(NonCompositedMainThreadScrollingReasonTest, BoxShadowTest) {
|
| @@ -1259,8 +1253,7 @@ TEST_P(NonCompositedMainThreadScrollingReasonTest,
|
| ToLayoutBoxModelObject(container2->GetLayoutObject())
|
| ->GetScrollableArea();
|
| ASSERT_TRUE(scrollable_area2);
|
| - EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() &
|
| - MainThreadScrollingReason::kHasBorderRadius);
|
| + EXPECT_TRUE(scrollable_area2->UsesCompositedScrolling());
|
| }
|
|
|
| } // namespace blink
|
|
|