| Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| index 6fde443334dd11e05976d3406fb927cb3e945a76..cc8169e228c3a82347e93faab387e4fb06e42316 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| @@ -658,7 +658,10 @@ void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded() {
|
| TRACE_EVENT0("input",
|
| "ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded");
|
|
|
| - if (!RuntimeEnabledFeatures::touchEventAPIEnabled())
|
| + // TODO(sunyunjia): remove all refs to touchEvenFeatureDetectionEnabled
|
| + // in this class since we are always firing touch events.
|
| + // crbug.com/671232
|
| + if (!RuntimeEnabledFeatures::touchEventFeatureDetectionEnabled())
|
| return;
|
|
|
| // TODO(chrishtr): implement touch event target rects for SPv2.
|
| @@ -729,7 +732,7 @@ void ScrollingCoordinator::setTouchEventTargetRects(
|
| }
|
|
|
| void ScrollingCoordinator::touchEventTargetRectsDidChange() {
|
| - if (!RuntimeEnabledFeatures::touchEventAPIEnabled())
|
| + if (!RuntimeEnabledFeatures::touchEventFeatureDetectionEnabled())
|
| return;
|
|
|
| DCHECK(m_page);
|
| @@ -1037,7 +1040,7 @@ static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects,
|
| void ScrollingCoordinator::computeTouchEventTargetRects(
|
| LayerHitTestRects& rects) {
|
| TRACE_EVENT0("input", "ScrollingCoordinator::computeTouchEventTargetRects");
|
| - DCHECK(RuntimeEnabledFeatures::touchEventAPIEnabled());
|
| + DCHECK(RuntimeEnabledFeatures::touchEventFeatureDetectionEnabled());
|
|
|
| Document* document = m_page->deprecatedLocalMainFrame()->document();
|
| if (!document || !document->view())
|
|
|