Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp

Issue 12254005: Merge 141769 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/features.gypi ('k') | Source/WebKit/chromium/tests/data/non-fast-scrollable.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
===================================================================
--- Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp (revision 142739)
+++ Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp (working copy)
@@ -43,9 +43,7 @@
#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;
@@ -78,6 +76,7 @@
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));
@@ -196,11 +195,10 @@
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.
@@ -225,6 +223,5 @@
WebLayer* webScrollLayer = static_cast<WebLayer*>(layerBacking->scrollingContentsLayer()->platformLayer());
ASSERT_TRUE(webScrollLayer->scrollable());
}
-#endif // ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
} // namespace
« no previous file with comments | « Source/WebKit/chromium/features.gypi ('k') | Source/WebKit/chromium/tests/data/non-fast-scrollable.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698