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 e0d276c1d2c42cf8661c3608c1b50ba38aade4b5..fe04c5a66b7f62cd407af5223674f1da69f07753 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()) |