Clip related property and border radius are now recorded for UMA

third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

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 10551bdfd3adc7563b3cdbd6931c2252f6f189b5..af4a31244d541a1848f6cfbfcfa09888e32cbd33 100644
--- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -1078,10 +1078,13 @@ class StyleRelatedMainThreadScrollingReasonTest
 
     ASSERT_TRUE(frameView->mainThreadScrollingReasons() & reason);
 
-    webViewImpl()->settings()->setPreferCompositingToLCDTextEnabled(true);
-    forceFullCompositingUpdate();
-
-    ASSERT_FALSE(frameView->mainThreadScrollingReasons());
+    if (reason & (MainThreadScrollingReason::kHasOpacity |
+                  MainThreadScrollingReason::kHasTransform |
+                  MainThreadScrollingReason::kBackgroundNotOpaqueInRect)) {

[bokan, 2017/01/05 14:05:48]

You should also check that there aren't any of the non-LCD-text reasons
otherwise the assert below will fail. You currently don't test any layers that
have more than one reason so that wont happen, but I think you should add a test
that uses two reasons, e.g. "border-radius and opacity" and ensure that the
appropriate reasons are set.

[yigu, 2017/01/05 14:46:51]

Done.

+      webViewImpl()->settings()->setPreferCompositingToLCDTextEnabled(true);
+      forceFullCompositingUpdate();
+      ASSERT_FALSE(frameView->mainThreadScrollingReasons());
+    }
   }
 };
 
@@ -1098,4 +1101,16 @@ TEST_F(StyleRelatedMainThreadScrollingReasonTest, BackgroundNotOpaqueTest) {
             MainThreadScrollingReason::kBackgroundNotOpaqueInRect);
 }
 
+TEST_F(StyleRelatedMainThreadScrollingReasonTest, BorderRadiusTest) {
+  testStyle("border-radius", MainThreadScrollingReason::kHasBorderRadius);
+}
+
+TEST_F(StyleRelatedMainThreadScrollingReasonTest, ClipTest) {
+  testStyle("clip", MainThreadScrollingReason::kHasClipRelatedProperty);
+}
+
+TEST_F(StyleRelatedMainThreadScrollingReasonTest, ClipPathTest) {
+  testStyle("clip-path", MainThreadScrollingReason::kHasClipRelatedProperty);
+}
+
 }  // namespace blink