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

Unified Diff: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 406053002: Remove setting for disabling cc touch hit testing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove ScrollingCoordinator::touchHitTestingEnabled() Created 6 years, 5 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/core/page/scrolling/ScrollingCoordinator.h ('k') | Source/web/WebSettingsImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp
index 29d32e62a55265d45a37ec489e66b16bfcfbab65..a0ea5eb12a7c0b1445ce528ec60128dfed128432 100644
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -98,15 +98,6 @@ ScrollingCoordinator::~ScrollingCoordinator()
{
}
-bool ScrollingCoordinator::touchHitTestingEnabled() const
-{
- if (!m_page->mainFrame()->isLocalFrame())
- return false;
- RenderView* contentRenderer = m_page->deprecatedLocalMainFrame()->contentRenderer();
- Settings* settings = m_page->mainFrame()->settings();
- return RuntimeEnabledFeatures::touchEnabled() && settings->compositorTouchHitTesting() && contentRenderer && contentRenderer->usesCompositing();
-}
-
void ScrollingCoordinator::setShouldHandleScrollGestureOnMainThreadRegion(const Region& region)
{
if (!m_page->mainFrame()->isLocalFrame())
@@ -526,7 +517,7 @@ void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded()
{
TRACE_EVENT0("input", "ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded");
- if (!touchHitTestingEnabled())
+ if (!RuntimeEnabledFeatures::touchEnabled())
return;
LayerHitTestRects touchEventTargetRects;
@@ -590,7 +581,7 @@ void ScrollingCoordinator::setTouchEventTargetRects(LayerHitTestRects& layerRect
void ScrollingCoordinator::touchEventTargetRectsDidChange()
{
- if (!touchHitTestingEnabled())
+ if (!RuntimeEnabledFeatures::touchEnabled())
return;
// Wait until after layout to update.
@@ -822,7 +813,7 @@ static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects, co
void ScrollingCoordinator::computeTouchEventTargetRects(LayerHitTestRects& rects)
{
TRACE_EVENT0("input", "ScrollingCoordinator::computeTouchEventTargetRects");
- ASSERT(touchHitTestingEnabled());
+ ASSERT(RuntimeEnabledFeatures::touchEnabled());
Document* document = m_page->deprecatedLocalMainFrame()->document();
if (!document || !document->view())
« no previous file with comments | « Source/core/page/scrolling/ScrollingCoordinator.h ('k') | Source/web/WebSettingsImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698