End-to-end prototype of compositor scrolling with slimming paint v2

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

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 6730 matching lines @@
     // is called from LocalFrame::createView (before the frame is associated
     // with the the view).
     if (view)
       m_didScrollFrame = true;
   }
 
  private:
   bool m_didScrollFrame;
 };
 
-TEST_F(WebFrameTest, CompositorScrollIsUserScrollLongPage) {
+// TODO(pdr): Merge WebFrameTestForSpv1AndSpv2 and ParameterizedWebFrameTest so
+// more tests run with both (and neither) slimming paint v2 and root layer
+// scrolling.
+typedef bool TestParamSlimmingPaintV2;
+class WebFrameTestForSpv1AndSpv2
+    : public ::testing::WithParamInterface<TestParamSlimmingPaintV2>,
+      private ScopedSlimmingPaintV2ForTest,
+      public WebFrameTest {
+ public:
+  WebFrameTestForSpv1AndSpv2() : ScopedSlimmingPaintV2ForTest(GetParam()) {}
+};
+
+INSTANTIATE_TEST_CASE_P(All, WebFrameTestForSpv1AndSpv2, ::testing::Bool());
+
+TEST_P(WebFrameTestForSpv1AndSpv2, CompositorScrollIsUserScrollLongPage) {
   registerMockedHttpURLLoad("long_scroll.html");
   TestScrolledFrameClient client;
 
   // Make sure we initialize to minimum scale, even if the window size
   // only becomes available after the load begins.
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "long_scroll.html", true,
                                   &client);
   webViewHelper.resize(WebSize(1000, 1000));
 
   WebLocalFrameImpl* frameImpl = webViewHelper.webView()->mainFrameImpl();
   DocumentLoader::InitialScrollState& initialScrollState =
       frameImpl->frame()->loader().documentLoader()->initialScrollState();
   GraphicsLayer* frameViewLayer = frameImpl->frameView()->layerForScrolling();
 
   EXPECT_FALSE(client.wasFrameScrolled());
   EXPECT_FALSE(initialScrollState.wasScrolledByUser);
 
   // Do a compositor scroll, verify that this is counted as a user scroll.
   frameViewLayer->platformLayer()->setScrollPositionDouble(
       WebDoublePoint(0, 1));
-  frameViewLayer->didScroll();
+  auto* scrollableArea = frameImpl->frameView()->layoutViewportScrollableArea();
+  scrollableArea->didScroll(gfx::ScrollOffset(0, 1));
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 1.7f, 0);
   EXPECT_TRUE(client.wasFrameScrolled());
   EXPECT_TRUE(initialScrollState.wasScrolledByUser);
 
   client.reset();
   initialScrollState.wasScrolledByUser = false;
 
   // The page scale 1.0f and scroll.
   frameViewLayer->platformLayer()->setScrollPositionDouble(
       WebDoublePoint(0, 2));
-  frameViewLayer->didScroll();
+  scrollableArea->didScroll(gfx::ScrollOffset(0, 2));
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 1.0f, 0);
   EXPECT_TRUE(client.wasFrameScrolled());
   EXPECT_TRUE(initialScrollState.wasScrolledByUser);
   client.reset();
   initialScrollState.wasScrolledByUser = false;
 
   // No scroll event if there is no scroll delta.
-  frameViewLayer->didScroll();
+  scrollableArea->didScroll(gfx::ScrollOffset(0, 2));
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 1.0f, 0);
   EXPECT_FALSE(client.wasFrameScrolled());
   EXPECT_FALSE(initialScrollState.wasScrolledByUser);
   client.reset();
 
   // Non zero page scale and scroll.
   frameViewLayer->platformLayer()->setScrollPositionDouble(
       WebDoublePoint(9, 15));
-  frameViewLayer->didScroll();
+  scrollableArea->didScroll(gfx::ScrollOffset(9, 15));
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 0.6f, 0);
   EXPECT_TRUE(client.wasFrameScrolled());
   EXPECT_TRUE(initialScrollState.wasScrolledByUser);
   client.reset();
   initialScrollState.wasScrolledByUser = false;
 
   // Programmatic scroll.
   frameImpl->executeScript(WebScriptSource("window.scrollTo(0, 20);"));
   EXPECT_TRUE(client.wasFrameScrolled());
@@ skipping 4442 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink