| 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())
|
|
|