Touch event flag should control only DOM event firing.

third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

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 d8c6599e5cca8f50180a4cc7c1d0ef73cc436162..90f64e41f789078d2e8b5eb444fd59646ddea86a 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -97,7 +97,7 @@ ScrollingCoordinator::ScrollingCoordinator(Page* page)
       m_lastMainThreadScrollingReasons(0) {}
 
 ScrollingCoordinator::~ScrollingCoordinator() {
-  ASSERT(!m_page);
+  DCHECK(!m_page);
 }
 
 DEFINE_TRACE(ScrollingCoordinator) {
@@ -132,7 +132,7 @@ void ScrollingCoordinator::notifyOverflowUpdated() {
 }
 
 void ScrollingCoordinator::scrollableAreasDidChange() {
-  ASSERT(m_page);
+  DCHECK(m_page);
   if (!m_page->mainFrame()->isLocalFrame() ||
       !m_page->deprecatedLocalMainFrame()->view())
     return;
@@ -245,7 +245,7 @@ static void clearPositionConstraintExceptForLayer(GraphicsLayer* layer,
 
 static WebLayerPositionConstraint computePositionConstraint(
     const PaintLayer* layer) {
-  ASSERT(layer->hasCompositedLayerMapping());
+  DCHECK(layer->hasCompositedLayerMapping());
   do {
     if (layer->layoutObject()->style()->position() == FixedPosition) {
       const LayoutObject* fixedPositionObject = layer->layoutObject();
@@ -266,7 +266,7 @@ static WebLayerPositionConstraint computePositionConstraint(
 }
 
 void ScrollingCoordinator::updateLayerPositionConstraint(PaintLayer* layer) {
-  ASSERT(layer->hasCompositedLayerMapping());
+  DCHECK(layer->hasCompositedLayerMapping());
   CompositedLayerMapping* compositedLayerMapping =
       layer->compositedLayerMapping();
   GraphicsLayer* mainLayer = compositedLayerMapping->childForSuperlayers();
@@ -333,7 +333,7 @@ ScrollingCoordinator::createSolidColorScrollbarLayer(
 }
 
 static void detachScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer) {
-  ASSERT(scrollbarGraphicsLayer);
+  DCHECK(scrollbarGraphicsLayer);
 
   scrollbarGraphicsLayer->setContentsToPlatformLayer(nullptr);
   scrollbarGraphicsLayer->setDrawsContent(true);
@@ -342,8 +342,8 @@ static void detachScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer) {
 static void setupScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer,
                                 WebScrollbarLayer* scrollbarLayer,
                                 WebLayer* scrollLayer) {
-  ASSERT(scrollbarGraphicsLayer);
-  ASSERT(scrollbarLayer);
+  DCHECK(scrollbarGraphicsLayer);
+  DCHECK(scrollbarLayer);
 
   if (!scrollLayer) {
     detachScrollbarLayer(scrollbarGraphicsLayer);
@@ -408,7 +408,7 @@ void ScrollingCoordinator::scrollableAreaScrollbarLayerDidChange(
 
       std::unique_ptr<WebScrollbarLayer> webScrollbarLayer;
       if (settings->useSolidColorScrollbars()) {
-        ASSERT(RuntimeEnabledFeatures::overlayScrollbarsEnabled());
+        DCHECK(RuntimeEnabledFeatures::overlayScrollbarsEnabled());
         webScrollbarLayer = createSolidColorScrollbarLayer(
             orientation, scrollbar.theme().thumbThickness(scrollbar),
             scrollbar.theme().trackPosition(scrollbar),
@@ -536,7 +536,7 @@ static void projectRectsToGraphicsLayerSpaceRecursive(
     const PaintLayer* compositedLayer =
         layerIter->key
             ->enclosingLayerForPaintInvalidationCrossingFrameBoundaries();
-    ASSERT(compositedLayer);
+    DCHECK(compositedLayer);
 
     // Find the appropriate GraphicsLayer for the composited Layer.
     GraphicsLayer* graphicsLayer =
@@ -654,7 +654,7 @@ void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded() {
   TRACE_EVENT0("input",
                "ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded");
 
-  if (!RuntimeEnabledFeatures::touchEnabled())
+  if (!RuntimeEnabledFeatures::touchAPIEnabled())
     return;
 
   // TODO(chrishtr): implement touch event target rects for SPv2.
@@ -697,7 +697,7 @@ void ScrollingCoordinator::setTouchEventTargetRects(
       const PaintLayer* compositedLayer =
           layerRect.key
               ->enclosingLayerForPaintInvalidationCrossingFrameBoundaries();
-      ASSERT(compositedLayer);
+      DCHECK(compositedLayer);
       m_layersWithTouchRects.add(compositedLayer);
     }
   }
@@ -725,10 +725,10 @@ void ScrollingCoordinator::setTouchEventTargetRects(
 }
 
 void ScrollingCoordinator::touchEventTargetRectsDidChange() {
-  if (!RuntimeEnabledFeatures::touchEnabled())
+  if (!RuntimeEnabledFeatures::touchAPIEnabled())
     return;
 
-  ASSERT(m_page);
+  DCHECK(m_page);
   if (!m_page->mainFrame()->isLocalFrame() ||
       !m_page->deprecatedLocalMainFrame()->view())
     return;
@@ -848,7 +848,7 @@ void ScrollingCoordinator::willCloseLayerTreeView(
 }
 
 void ScrollingCoordinator::willBeDestroyed() {
-  ASSERT(m_page);
+  DCHECK(m_page);
 
   m_page = nullptr;
   for (const auto& scrollbar : m_horizontalScrollbars)
@@ -859,7 +859,7 @@ void ScrollingCoordinator::willBeDestroyed() {
 
 bool ScrollingCoordinator::coordinatesScrollingForFrameView(
     FrameView* frameView) const {
-  ASSERT(isMainThread());
+  DCHECK(isMainThread());
 
   // We currently only support composited mode.
   LayoutViewItem layoutView = frameView->frame().contentLayoutItem();
@@ -937,7 +937,7 @@ Region ScrollingCoordinator::computeShouldHandleScrollGestureOnMainThreadRegion(
 
 static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects,
                                                     const Document* document) {
-  ASSERT(document);
+  DCHECK(document);
   const EventTargetSet* targets =
       document->frameHost()->eventHandlerRegistry().eventHandlerTargets(
           EventHandlerRegistry::TouchStartOrMoveEventBlocking);
@@ -1032,7 +1032,7 @@ static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects,
 void ScrollingCoordinator::computeTouchEventTargetRects(
     LayerHitTestRects& rects) {
   TRACE_EVENT0("input", "ScrollingCoordinator::computeTouchEventTargetRects");
-  ASSERT(RuntimeEnabledFeatures::touchEnabled());
+  DCHECK(RuntimeEnabledFeatures::touchAPIEnabled());
 
   Document* document = m_page->deprecatedLocalMainFrame()->document();
   if (!document || !document->view())
@@ -1044,8 +1044,8 @@ void ScrollingCoordinator::computeTouchEventTargetRects(
 void ScrollingCoordinator::
     frameViewHasBackgroundAttachmentFixedObjectsDidChange(
         FrameView* frameView) {
-  ASSERT(isMainThread());
-  ASSERT(m_page);
+  DCHECK(isMainThread());
+  DCHECK(m_page);
 
   if (!coordinatesScrollingForFrameView(frameView))
     return;
@@ -1055,8 +1055,8 @@ void ScrollingCoordinator::
 
 void ScrollingCoordinator::frameViewFixedObjectsDidChange(
     FrameView* frameView) {
-  ASSERT(isMainThread());
-  ASSERT(m_page);
+  DCHECK(isMainThread());
+  DCHECK(m_page);
 
   if (!coordinatesScrollingForFrameView(frameView))
     return;
@@ -1087,8 +1087,8 @@ bool ScrollingCoordinator::isForMainFrame(
 }
 
 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) {
-  ASSERT(isMainThread());
-  ASSERT(m_page);
+  DCHECK(isMainThread());
+  DCHECK(m_page);
 
   if (!coordinatesScrollingForFrameView(frameView))
     return;
@@ -1099,7 +1099,7 @@ void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) {
 #if OS(MACOSX)
 void ScrollingCoordinator::handleWheelEventPhase(
     PlatformWheelEventPhase phase) {
-  ASSERT(isMainThread());
+  DCHECK(isMainThread());
 
   if (!m_page)
     return;
@@ -1120,8 +1120,8 @@ bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(
     return false;
 
   for (const LayoutObject* layoutObject : *viewportConstrainedObjects) {
-    ASSERT(layoutObject->isBoxModelObject() && layoutObject->hasLayer());
-    ASSERT(layoutObject->style()->position() == FixedPosition ||
+    DCHECK(layoutObject->isBoxModelObject() && layoutObject->hasLayer());
+    DCHECK(layoutObject->style()->position() == FixedPosition ||
            layoutObject->style()->position() == StickyPosition);
     PaintLayer* layer = toLayoutBoxModelObject(layoutObject)->layer();
 
@@ -1205,7 +1205,7 @@ MainThreadScrollingReasons ScrollingCoordinator::mainThreadScrollingReasons()
 }
 
 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const {
-  ASSERT(m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >=
+  DCHECK(m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >=
          DocumentLifecycle::CompositingClean);
   if (WebLayer* scrollLayer = toWebLayer(
           m_page->deprecatedLocalMainFrame()->view()->layerForScrolling())) {