Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1248)

Unified Diff: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

Issue 2859483006: cc: Enable composited border-radius scrolling.
Patch Set: Fix webkit unit tests. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3cb2d29f855f050d2b023d7cb872ff68a4e3cfca..6eaac06700f55c1c69a9fd63b8354d2757e79686 100644
--- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -1136,11 +1136,6 @@ TEST_P(NonCompositedMainThreadScrollingReasonTest, BackgroundNotOpaqueTest) {
MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText);
}
-TEST_P(NonCompositedMainThreadScrollingReasonTest, BorderRadiusTest) {
- TestNonCompositedReasons("border-radius",
- MainThreadScrollingReason::kHasBorderRadius);
-}
-
TEST_P(NonCompositedMainThreadScrollingReasonTest, ClipTest) {
TestNonCompositedReasons("clip",
MainThreadScrollingReason::kHasClipRelatedProperty);
@@ -1196,9 +1191,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) {
@@ -1253,18 +1247,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

Powered by Google App Engine
This is Rietveld 408576698