Clip related property and border radius are now recorded for UMA

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 1020 matching lines @@
       webScrollLayer->mainThreadScrollingReasons() &
       MainThreadScrollingReason::kHasNonLayerViewportConstrainedObjects);
 }
 
 class StyleRelatedMainThreadScrollingReasonTest
     : public ScrollingCoordinatorTest {
  protected:
   StyleRelatedMainThreadScrollingReasonTest() {
     registerMockedHttpURLLoad("two_scrollable_area.html");
     navigateTo(m_baseURL + "two_scrollable_area.html");
+    m_LCDTextRelatedReasons =
+        MainThreadScrollingReason::kHasOpacity |
+        MainThreadScrollingReason::kHasTransform |
+        MainThreadScrollingReason::kBackgroundNotOpaqueInRect;
   }
   void testStyle(const std::string& target, const uint32_t reason) {
     webViewImpl()->settings()->setPreferCompositingToLCDTextEnabled(false);
     Document* document = frame()->document();
     Element* container = document->getElementById("scroller1");
     container->setAttribute("class", target.c_str(), ASSERT_NO_EXCEPTION);
     container = document->getElementById("scroller2");
     container->setAttribute("class", target.c_str(), ASSERT_NO_EXCEPTION);
     forceFullCompositingUpdate();
 
@@ skipping 20 matching lines @@
     forceFullCompositingUpdate();
 
     ASSERT_FALSE(frameView->mainThreadScrollingReasons() & reason);
 
     // Add target attribute would again lead to scroll on main thread
     container->setAttribute("class", target.c_str(), ASSERT_NO_EXCEPTION);
     forceFullCompositingUpdate();
 
     ASSERT_TRUE(frameView->mainThreadScrollingReasons() & reason);
 
-    webViewImpl()->settings()->setPreferCompositingToLCDTextEnabled(true);
-    forceFullCompositingUpdate();
+    if ((reason & m_LCDTextRelatedReasons) &&
+        !(reason & ~m_LCDTextRelatedReasons)) {
+      webViewImpl()->settings()->setPreferCompositingToLCDTextEnabled(true);
+      forceFullCompositingUpdate();
+      ASSERT_FALSE(frameView->mainThreadScrollingReasons());
+    }
+  }
 
-    ASSERT_FALSE(frameView->mainThreadScrollingReasons());
-  }
+ private:
+  uint32_t m_LCDTextRelatedReasons;

[bokan, 2017/01/05 14:52:41]

nit: this can be a static constexpr I think.

[yigu, 2017/01/05 20:20:27]

Done.

 };
 
 TEST_F(StyleRelatedMainThreadScrollingReasonTest, TransparentTest) {
   testStyle("transparent", MainThreadScrollingReason::kHasOpacity);
 }
 
 TEST_F(StyleRelatedMainThreadScrollingReasonTest, TransformTest) {
   testStyle("transform", MainThreadScrollingReason::kHasTransform);
 }
 
 TEST_F(StyleRelatedMainThreadScrollingReasonTest, BackgroundNotOpaqueTest) {
   testStyle("background-not-opaque",
             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);
+}
+
+TEST_F(StyleRelatedMainThreadScrollingReasonTest, LCDTextEnabledTest) {
+  testStyle("transparent border-radius",
+            MainThreadScrollingReason::kHasOpacity |
+                MainThreadScrollingReason::kHasBorderRadius);
+}
+
 }  // namespace blink