Move logic of recording main thread scrolling reasons from cc to blink::ScrollManager

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 66b0374e619429a62e7d7b77a3a51b3a5ffa2e59..a07f1b86457a2eefd3c465d1e3a5a0c6be4abf93 100644
--- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -1047,7 +1047,7 @@ TEST_P(ScrollingCoordinatorTest,
   }
 }
 
-class StyleRelatedMainThreadScrollingReasonTest
+class NonCompositedMainThreadScrollingReasonTest
     : public ScrollingCoordinatorTest {
   static const uint32_t kLCDTextRelatedReasons =
       MainThreadScrollingReason::kHasOpacityAndLCDText |
@@ -1055,90 +1055,100 @@ class StyleRelatedMainThreadScrollingReasonTest
       MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText;
 
  protected:
-  StyleRelatedMainThreadScrollingReasonTest() {
+  NonCompositedMainThreadScrollingReasonTest() {
     RegisterMockedHttpURLLoad("two_scrollable_area.html");
     NavigateTo(base_url_ + "two_scrollable_area.html");
   }
-  void TestStyle(const std::string& target, const uint32_t reason) {
+  void TestNonCompositedReasons(const std::string& target,
+                                const uint32_t reason) {
     GetWebViewImpl()->GetSettings()->SetPreferCompositingToLCDTextEnabled(
         false);
     Document* document = GetFrame()->GetDocument();
     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();
 
+    PaintLayerScrollableArea* scrollable_area =
+        ToLayoutBoxModelObject(container->GetLayoutObject())
+            ->GetScrollableArea();
+    ASSERT_TRUE(scrollable_area);
+    ASSERT_TRUE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+                reason);
+
+    Element* container_2 = document->GetElementById("scroller2");

[tdresser, 2017/04/11 18:50:48]

I think container2 would be more typical.

[yigu, 2017/04/11 21:28:11]

Done.

+    PaintLayerScrollableArea* scrollable_area_2 =
+        ToLayoutBoxModelObject(container_2->GetLayoutObject())
+            ->GetScrollableArea();
+    ASSERT_TRUE(scrollable_area_2);
+    // Different scrollable area should remain unaffected.
+    ASSERT_FALSE(

[tdresser, 2017/04/11 18:50:48]

Many of the ASSERTs in this file should be EXPECTs.

Might as well at least use EXPECT where appropriate for new usages.

[yigu, 2017/04/11 21:28:11]

Done.

+        scrollable_area_2->GetNonCompositedMainThreadScrollingReasons() &
+        reason);
+
     FrameView* frame_view = GetFrame()->View();
     ASSERT_TRUE(frame_view);
-    ASSERT_TRUE(frame_view->GetMainThreadScrollingReasons() & reason);
-
-    // Remove the target attribute from one of the scrollers.
-    // Still need to scroll on main thread.
-    container = document->GetElementById("scroller1");
-    DCHECK(container);
-
-    container->removeAttribute("class");
-    ForceFullCompositingUpdate();
-
-    ASSERT_TRUE(frame_view->GetMainThreadScrollingReasons() & reason);
-
-    // Remove attribute from the other scroller would lead to
-    // scroll on impl.
-    container = document->GetElementById("scroller2");
-    DCHECK(container);
+    ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & reason);
 
+    // Remove attribute from the scroller 1 would lead to scroll on impl.
     container->removeAttribute("class");
     ForceFullCompositingUpdate();
 
+    ASSERT_FALSE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+                 reason);
     ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & reason);
 
     // Add target attribute would again lead to scroll on main thread
     container->setAttribute("class", target.c_str(), ASSERT_NO_EXCEPTION);
     ForceFullCompositingUpdate();
 
-    ASSERT_TRUE(frame_view->GetMainThreadScrollingReasons() & reason);
+    ASSERT_TRUE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+                reason);
+    ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & reason);
 
     if ((reason & kLCDTextRelatedReasons) &&
         !(reason & ~kLCDTextRelatedReasons)) {
       GetWebViewImpl()->GetSettings()->SetPreferCompositingToLCDTextEnabled(
           true);
       ForceFullCompositingUpdate();
+      ASSERT_FALSE(
+          scrollable_area->GetNonCompositedMainThreadScrollingReasons());
       ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons());
     }
   }
 };
 
 INSTANTIATE_TEST_CASE_P(All,
-                        StyleRelatedMainThreadScrollingReasonTest,
+                        NonCompositedMainThreadScrollingReasonTest,
                         ::testing::Bool());
 
-// TODO(yigu): This test and all other style realted main thread scrolling
-// reason tests below have been disabled due to https://crbug.com/701355.
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_TransparentTest) {
-  TestStyle("transparent", MainThreadScrollingReason::kHasOpacityAndLCDText);
+TEST_P(NonCompositedMainThreadScrollingReasonTest, TransparentTest) {
+  TestNonCompositedReasons("transparent",
+                           MainThreadScrollingReason::kHasOpacityAndLCDText);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_TransformTest) {
-  TestStyle("transform", MainThreadScrollingReason::kHasTransformAndLCDText);
+TEST_P(NonCompositedMainThreadScrollingReasonTest, TransformTest) {
+  TestNonCompositedReasons("transform",
+                           MainThreadScrollingReason::kHasTransformAndLCDText);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest,
-       DISABLED_BackgroundNotOpaqueTest) {
-  TestStyle("background-not-opaque",
-            MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText);
+TEST_P(NonCompositedMainThreadScrollingReasonTest, BackgroundNotOpaqueTest) {
+  TestNonCompositedReasons(
+      "background-not-opaque",
+      MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_BorderRadiusTest) {
-  TestStyle("border-radius", MainThreadScrollingReason::kHasBorderRadius);
+TEST_P(NonCompositedMainThreadScrollingReasonTest, BorderRadiusTest) {
+  TestNonCompositedReasons("border-radius",
+                           MainThreadScrollingReason::kHasBorderRadius);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_ClipTest) {
-  TestStyle("clip", MainThreadScrollingReason::kHasClipRelatedProperty);
+TEST_P(NonCompositedMainThreadScrollingReasonTest, ClipTest) {
+  TestNonCompositedReasons("clip",
+                           MainThreadScrollingReason::kHasClipRelatedProperty);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_ClipPathTest) {
-  uint32_t reason = MainThreadScrollingReason::kHasClipRelatedProperty;
+TEST_P(NonCompositedMainThreadScrollingReasonTest, ClipPathTest) {
+  uint32_t clip_reason = MainThreadScrollingReason::kHasClipRelatedProperty;
   GetWebViewImpl()->GetSettings()->SetPreferCompositingToLCDTextEnabled(false);
   Document* document = GetFrame()->GetDocument();
   // Test ancestor with ClipPath
@@ -1146,17 +1156,27 @@ TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_ClipPathTest) {
   DCHECK(element);
   element->setAttribute(HTMLNames::styleAttr,
                         "clip-path:circle(115px at 20px 20px);");
+  Element* container = document->getElementById("scroller1");
+  DCHECK(container);
   ForceFullCompositingUpdate();
 
+  PaintLayerScrollableArea* scrollable_area =
+      ToLayoutBoxModelObject(container->GetLayoutObject())->GetScrollableArea();
+  ASSERT_TRUE(scrollable_area);
+  ASSERT_TRUE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+              clip_reason);
+
   FrameView* frame_view = GetFrame()->View();
   ASSERT_TRUE(frame_view);
-  ASSERT_TRUE(frame_view->GetMainThreadScrollingReasons() & reason);
+  ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & clip_reason);
 
   // Remove clip path from ancestor.
   element->removeAttribute(HTMLNames::styleAttr);
   ForceFullCompositingUpdate();
 
-  ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & reason);
+  ASSERT_FALSE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+               clip_reason);
+  ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & clip_reason);
 
   // Test descendant with ClipPath
   element = document->GetElementById("content1");
@@ -1164,23 +1184,59 @@ TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_ClipPathTest) {
   element->setAttribute(HTMLNames::styleAttr,
                         "clip-path:circle(115px at 20px 20px);");
   ForceFullCompositingUpdate();
-  ASSERT_TRUE(frame_view->GetMainThreadScrollingReasons() & reason);
+  ASSERT_TRUE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+              clip_reason);
+  ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & clip_reason);
 
   // Remove clip path from descendant.
   element->removeAttribute(HTMLNames::styleAttr);
   ForceFullCompositingUpdate();
-  ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & reason);
+  ASSERT_FALSE(scrollable_area->GetNonCompositedMainThreadScrollingReasons() &
+               clip_reason);
+  ASSERT_FALSE(frame_view->GetMainThreadScrollingReasons() & clip_reason);
+}
+
+TEST_P(NonCompositedMainThreadScrollingReasonTest, LCDTextEnabledTest) {
+  TestNonCompositedReasons("transparent border-radius",
+                           MainThreadScrollingReason::kHasOpacityAndLCDText |
+                               MainThreadScrollingReason::kHasBorderRadius);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_LCDTextEnabledTest) {
-  TestStyle("transparent border-radius",
-            MainThreadScrollingReason::kHasOpacityAndLCDText |
-                MainThreadScrollingReason::kHasBorderRadius);
+TEST_P(NonCompositedMainThreadScrollingReasonTest, BoxShadowTest) {
+  TestNonCompositedReasons(
+      "box-shadow", MainThreadScrollingReason::kHasBoxShadowFromNonRootLayer);
 }
 
-TEST_P(StyleRelatedMainThreadScrollingReasonTest, DISABLED_BoxShadowTest) {
-  TestStyle("box-shadow",
-            MainThreadScrollingReason::kHasBoxShadowFromNonRootLayer);
+TEST_P(NonCompositedMainThreadScrollingReasonTest,
+       CompositedWithLCDTextRelatedReasonsTest) {
+  // With "will-change:transform" we composite elements with
+  // LCDTextRelatedReasons only. For elements with other
+  // NonCompositedReasons, we don't create scrollingLayer for their
+  // CompositedLayerMapping therefore they don't get composited.
+  GetWebViewImpl()->GetSettings()->SetPreferCompositingToLCDTextEnabled(false);
+  Document* document = GetFrame()->GetDocument();
+  Element* container = document->getElementById("scroller1");
+  DCHECK(container);
+  container->setAttribute("class", "composited transparent",
+                          ASSERT_NO_EXCEPTION);
+  ForceFullCompositingUpdate();
+
+  PaintLayerScrollableArea* scrollable_area =
+      ToLayoutBoxModelObject(container->GetLayoutObject())->GetScrollableArea();
+  ASSERT_TRUE(scrollable_area);
+  ASSERT_FALSE(scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+
+  Element* container_2 = document->getElementById("scroller2");
+  DCHECK(container_2);
+  container_2->setAttribute("class", "composited border-radius",
+                            ASSERT_NO_EXCEPTION);
+  ForceFullCompositingUpdate();
+  PaintLayerScrollableArea* scrollable_area_2 =
+      ToLayoutBoxModelObject(container_2->GetLayoutObject())
+          ->GetScrollableArea();
+  ASSERT_TRUE(scrollable_area_2);
+  ASSERT_TRUE(scrollable_area_2->GetNonCompositedMainThreadScrollingReasons() &
+              MainThreadScrollingReason::kHasBorderRadius);
 }
 
 }  // namespace blink