Merge 141769

Source/WebKit/chromium/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 25 matching lines @@
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebSettings.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include <gtest/gtest.h>
 #include <public/WebCompositorSupport.h>
 #include <public/WebLayer.h>
 #include <webkit/support/webkit_support.h>
 
-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
 #include "GraphicsLayerChromium.h"
-#endif
 
 using namespace WebCore;
 using namespace WebKit;
 
 namespace {
 
 class MockWebViewClient : public WebViewClient {
 public:
     virtual WebCompositorOutputSurface* createOutputSurface() OVERRIDE
     {
@@ skipping 12 matching lines @@
     {
         Platform::current()->compositorSupport()->initialize(0);
 
         // We cannot reuse FrameTestHelpers::createWebViewAndLoad here because the compositing
         // settings need to be set before the page is loaded.
         m_webViewImpl = static_cast<WebViewImpl*>(WebView::create(&m_mockWebViewClient));
         m_webViewImpl->settings()->setJavaScriptEnabled(true);
         m_webViewImpl->settings()->setForceCompositingMode(true);
         m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true);
         m_webViewImpl->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
+        m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEnabled(true);
         m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true);
         m_webViewImpl->initializeMainFrame(&m_mockWebFrameClient);
         m_webViewImpl->resize(IntSize(320, 240));
     }
 
     virtual ~ScrollingCoordinatorChromiumTest()
     {
         webkit_support::UnregisterAllMockedURLs();
         m_webViewImpl->close();
 
@@ skipping 98 matching lines @@
 
 TEST_F(ScrollingCoordinatorChromiumTest, clippedBodyTest)
 {
     registerMockedHttpURLLoad("clipped-body.html");
     navigateTo(m_baseURL + "clipped-body.html");
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_EQ(0u, rootScrollLayer->nonFastScrollableRegion().size());
 }
 
-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
-TEST_F(ScrollingCoordinatorChromiumTest, touchOverflowScrolling)
+TEST_F(ScrollingCoordinatorChromiumTest, overflowScrolling)
 {
-    registerMockedHttpURLLoad("touch-overflow-scrolling.html");
-    navigateTo(m_baseURL + "touch-overflow-scrolling.html");
+    registerMockedHttpURLLoad("overflow-scrolling.html");
+    navigateTo(m_baseURL + "overflow-scrolling.html");
 
     // 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());
 
     RenderLayer* layer = toRenderBoxModelObject(renderer)->layer();
     ASSERT_TRUE(layer->usesCompositedScrolling());
     ASSERT_TRUE(layer->isComposited());
 
     RenderLayerBacking* layerBacking = layer->backing();
     ASSERT_TRUE(layerBacking->hasScrollingLayer());
     ASSERT(layerBacking->scrollingContentsLayer());
 
     GraphicsLayerChromium* graphicsLayerChromium = static_cast<GraphicsLayerChromium*>(layerBacking->scrollingContentsLayer());
     ASSERT_EQ(layer, graphicsLayerChromium->scrollableArea());
 
     WebLayer* webScrollLayer = static_cast<WebLayer*>(layerBacking->scrollingContentsLayer()->platformLayer());
     ASSERT_TRUE(webScrollLayer->scrollable());
 }
-#endif // ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
 
 } // namespace