Merge 159961 "Defer the real work in updateCompositingLayers unt..."

Source/web/tests/ScrollingCoordinatorChromiumTest.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 85 matching lines @@
         m_webViewImpl->close();
         m_mainFrame->close();
     }
 
     void navigateTo(const std::string& url)
     {
         FrameTestHelpers::loadFrame(m_webViewImpl->mainFrame(), url);
         Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     }
 
+    void forceFullCompositingUpdate()
+    {
+        RenderLayerCompositor* compositor = m_webViewImpl->mainFrameImpl()->frame()->contentRenderer()->compositor();
+        compositor->updateCompositingLayers(CompositingUpdateFinishAllDeferredWork);
+    }
+
     void registerMockedHttpURLLoad(const std::string& fileName)
     {
         URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(fileName.c_str()));
     }
 
     WebLayer* getRootScrollLayer()
     {
         RenderLayerCompositor* compositor = m_webViewImpl->mainFrameImpl()->frame()->contentRenderer()->compositor();
         ASSERT(compositor);
         ASSERT(compositor->scrollLayer());
 
         WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer();
         return webScrollLayer;
     }
 
 protected:
     std::string m_baseURL;
     MockWebFrameClient m_mockWebFrameClient;
     FakeWebViewClient m_mockWebViewClient;
     WebViewImpl* m_webViewImpl;
     WebFrame* m_mainFrame;
 };
 
 TEST_F(ScrollingCoordinatorChromiumTest, fastScrollingByDefault)
 {
     navigateTo("about:blank");
+    forceFullCompositingUpdate();
 
     // Make sure the scrolling coordinator is active.
     FrameView* frameView = m_webViewImpl->mainFrameImpl()->frameView();
     Page* page = m_webViewImpl->mainFrameImpl()->frame()->page();
     ASSERT_TRUE(page->scrollingCoordinator());
     ASSERT_TRUE(page->scrollingCoordinator()->coordinatesScrollingForFrameView(frameView));
 
     // Fast scrolling should be enabled by default.
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_TRUE(rootScrollLayer->scrollable());
@@ skipping 17 matching lines @@
     GraphicsLayer* graphicsLayer = compositedLayerMapping->mainGraphicsLayer();
     if (!graphicsLayer)
         return 0;
     return graphicsLayer->platformLayer();
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, fastScrollingForFixedPosition)
 {
     registerMockedHttpURLLoad("fixed-position.html");
     navigateTo(m_baseURL + "fixed-position.html");
+    forceFullCompositingUpdate();
 
     // Fixed position should not fall back to main thread scrolling.
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_FALSE(rootScrollLayer->shouldScrollOnMainThread());
 
     Document* document = m_webViewImpl->mainFrameImpl()->frame()->document();
     {
         Element* element = document->getElementById("div-tl");
         ASSERT_TRUE(element);
         WebLayer* layer = webLayerFromElement(element);
@@ skipping 64 matching lines @@
         WebLayerPositionConstraint constraint = layer->positionConstraint();
         ASSERT_TRUE(constraint.isFixedPosition);
         ASSERT_TRUE(constraint.isFixedToRightEdge && constraint.isFixedToBottomEdge);
     }
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, nonFastScrollableRegion)
 {
     registerMockedHttpURLLoad("non-fast-scrollable.html");
     navigateTo(m_baseURL + "non-fast-scrollable.html");
+    forceFullCompositingUpdate();
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     WebVector<WebRect> nonFastScrollableRegion = rootScrollLayer->nonFastScrollableRegion();
 
     ASSERT_EQ(1u, nonFastScrollableRegion.size());
     ASSERT_EQ(WebRect(8, 8, 10, 10), nonFastScrollableRegion[0]);
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, wheelEventHandler)
 {
     registerMockedHttpURLLoad("wheel-event-handler.html");
     navigateTo(m_baseURL + "wheel-event-handler.html");
+    forceFullCompositingUpdate();
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_TRUE(rootScrollLayer->haveWheelEventHandlers());
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, clippedBodyTest)
 {
     registerMockedHttpURLLoad("clipped-body.html");
     navigateTo(m_baseURL + "clipped-body.html");
+    forceFullCompositingUpdate();
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_EQ(0u, rootScrollLayer->nonFastScrollableRegion().size());
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, overflowScrolling)
 {
     registerMockedHttpURLLoad("overflow-scrolling.html");
     navigateTo(m_baseURL + "overflow-scrolling.html");
+    forceFullCompositingUpdate();
 
     // Verify the properties of the accelerated scrolling element starting from the RenderObject
     // all the way to the WebLayer.
     Element* scrollableElement = m_webViewImpl->mainFrameImpl()->frame()->document()->getElementById("scrollable");
     ASSERT(scrollableElement);
 
     RenderObject* renderer = scrollableElement->renderer();
     ASSERT_TRUE(renderer->isBoxModelObject());
     ASSERT_TRUE(renderer->hasLayer());
 
@@ skipping 18 matching lines @@
     ASSERT_TRUE(compositedLayerMapping->layerForVerticalScrollbar());
     ASSERT_TRUE(compositedLayerMapping->layerForVerticalScrollbar()->hasContentsLayer());
 #endif
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, iframeScrolling)
 {
     registerMockedHttpURLLoad("iframe-scrolling.html");
     registerMockedHttpURLLoad("iframe-scrolling-inner.html");
     navigateTo(m_baseURL + "iframe-scrolling.html");
+    forceFullCompositingUpdate();
 
     // Verify the properties of the accelerated scrolling element starting from the RenderObject
     // all the way to the WebLayer.
     Element* scrollableFrame = m_webViewImpl->mainFrameImpl()->frame()->document()->getElementById("scrollable");
     ASSERT_TRUE(scrollableFrame);
 
     RenderObject* renderer = scrollableFrame->renderer();
     ASSERT_TRUE(renderer);
     ASSERT_TRUE(renderer->isWidget());
 
@@ skipping 23 matching lines @@
     ASSERT_TRUE(innerCompositor->layerForVerticalScrollbar());
     ASSERT_TRUE(innerCompositor->layerForVerticalScrollbar()->hasContentsLayer());
 #endif
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, rtlIframe)
 {
     registerMockedHttpURLLoad("rtl-iframe.html");
     registerMockedHttpURLLoad("rtl-iframe-inner.html");
     navigateTo(m_baseURL + "rtl-iframe.html");
+    forceFullCompositingUpdate();
 
     // Verify the properties of the accelerated scrolling element starting from the RenderObject
     // all the way to the WebLayer.
     Element* scrollableFrame = m_webViewImpl->mainFrameImpl()->frame()->document()->getElementById("scrollable");
     ASSERT_TRUE(scrollableFrame);
 
     RenderObject* renderer = scrollableFrame->renderer();
     ASSERT_TRUE(renderer);
     ASSERT_TRUE(renderer->isWidget());
 
@@ skipping 18 matching lines @@
 
     int expectedScrollPosition = 958 + (innerFrameView->verticalScrollbar()->isOverlayScrollbar() ? 0 : 15);
     ASSERT_EQ(expectedScrollPosition, webScrollLayer->scrollPosition().x);
     ASSERT_EQ(expectedScrollPosition, webScrollLayer->maxScrollPosition().width);
 }
 
 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash)
 {
     registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html");
     navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html");
+    forceFullCompositingUpdate();
     // This test document setup an iframe with scrollbars, then switch to
     // an empty document by javascript.
 }
 
 } // namespace