| 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 36d1b80a6ccbcde8b4e0d789b1bce2b52e2d371e..6e6a319edb128a7250f00b08e3e7e2e76f8e726d 100644
|
| --- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
|
| @@ -1135,11 +1135,6 @@ TEST_P(NonCompositedMainThreadScrollingReasonTest, BackgroundNotOpaqueTest) {
|
| MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText);
|
| }
|
|
|
| -TEST_P(NonCompositedMainThreadScrollingReasonTest, BorderRadiusTest) {
|
| - TestNonCompositedReasons("border-radius",
|
| - MainThreadScrollingReason::kHasBorderRadius);
|
| -}
|
| -
|
| TEST_P(NonCompositedMainThreadScrollingReasonTest, ClipTest) {
|
| TestNonCompositedReasons("clip",
|
| MainThreadScrollingReason::kHasClipRelatedProperty);
|
| @@ -1195,9 +1190,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) {
|
| @@ -1252,18 +1246,6 @@ TEST_P(NonCompositedMainThreadScrollingReasonTest,
|
| ToLayoutBoxModelObject(container->GetLayoutObject())->GetScrollableArea();
|
| ASSERT_TRUE(scrollable_area);
|
| EXPECT_FALSE(scrollable_area->GetNonCompositedMainThreadScrollingReasons());
|
| -
|
| - Element* container2 = document->getElementById("scroller2");
|
| - ASSERT_TRUE(container2);
|
| - container2->setAttribute("class", "composited border-radius",
|
| - ASSERT_NO_EXCEPTION);
|
| - ForceFullCompositingUpdate();
|
| - PaintLayerScrollableArea* scrollable_area2 =
|
| - ToLayoutBoxModelObject(container2->GetLayoutObject())
|
| - ->GetScrollableArea();
|
| - ASSERT_TRUE(scrollable_area2);
|
| - EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() &
|
| - MainThreadScrollingReason::kHasBorderRadius);
|
| }
|
|
|
| } // namespace blink
|
|
|