(NOT FOR REVIEW) Distinguish between touch and touchmove handler presence

Source/core/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 810 matching lines @@
 
     const FrameTree& tree = frame->tree();
     for (Frame* subFrame = tree.firstChild(); subFrame; subFrame = subFrame->tree().nextSibling()) {
         if (subFrame->isLocalFrame())
             shouldHandleScrollGestureOnMainThreadRegion.unite(computeShouldHandleScrollGestureOnMainThreadRegion(toLocalFrame(subFrame), offset));
     }
 
     return shouldHandleScrollGestureOnMainThreadRegion;
 }
 
-static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects, const Document* document)
+static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects, const Document* document, EventHandlerRegistry::EventHandlerClass touchHandlerClass)
 {
     ASSERT(document);
-    const EventTargetSet* targets = document->frameHost()->eventHandlerRegistry().eventHandlerTargets(EventHandlerRegistry::TouchEvent);
+    const EventTargetSet* targets = document->frameHost()->eventHandlerRegistry().eventHandlerTargets(touchHandlerClass);
     if (!targets)
         return;
 
     // If there's a handler on the window, document, html or body element (fairly common in practice),
     // then we can quickly mark the entire document and skip looking at any other handlers.
     // Note that technically a handler on the body doesn't cover the whole document, but it's
     // reasonable to be conservative and report the whole document anyway.
     //
     // Fullscreen HTML5 video when OverlayFullscreenVideo is enabled is implemented by replacing the
     // root cc::layer with the video layer so doing this optimization causes the compositor to think
@@ skipping 16 matching lines @@
         Node* node = target->toNode();
         if (!node || !node->inDocument())
             continue;
 
         // If the document belongs to an invisible subframe it does not have a composited layer
         // and should be skipped.
         if (node->document().isInInvisibleSubframe())
             continue;
 
         if (node->isDocumentNode() && node != document) {
-            accumulateDocumentTouchEventTargetRects(rects, toDocument(node));
+            accumulateDocumentTouchEventTargetRects(rects, toDocument(node), touchHandlerClass);
         } else if (LayoutObject* layoutObject = node->layoutObject()) {
-            // If the set also contains one of our ancestor nodes then processing
+            // If the set already contains this node or one of our ancestor nodes then processing
             // this node would be redundant.
-            bool hasTouchEventTargetAncestor = false;
-            for (Node* ancestor = node->parentNode(); ancestor && !hasTouchEventTargetAncestor; ancestor = ancestor->parentNode()) {
+            bool rectsAlreadyIncluded = false;
+            for (Node* ancestor = node; ancestor && !rectsAlreadyIncluded; ancestor = ancestor->parentNode()) {
                 if (targets->contains(ancestor))
-                    hasTouchEventTargetAncestor = true;
+                    rectsAlreadyIncluded = true;
             }
-            if (!hasTouchEventTargetAncestor) {
+            if (!rectsAlreadyIncluded) {
                 // Walk up the tree to the outermost non-composited scrollable layer.
                 DeprecatedPaintLayer* enclosingNonCompositedScrollLayer = nullptr;
                 for (DeprecatedPaintLayer* parent = layoutObject->enclosingLayer(); parent && parent->compositingState() == NotComposited; parent = parent->parent()) {
                     if (parent->scrollsOverflow())
                         enclosingNonCompositedScrollLayer = parent;
                 }
 
                 // Report the whole non-composited scroll layer as a touch hit rect because any
                 // rects inside of it may move around relative to their enclosing composited layer
                 // without causing the rects to be recomputed. Non-composited scrolling occurs on
                 // the main thread, so we're not getting much benefit from compositor touch hit
                 // testing in this case anyway.
                 if (enclosingNonCompositedScrollLayer)
                     enclosingNonCompositedScrollLayer->computeSelfHitTestRects(rects);
 
                 layoutObject->computeLayerHitTestRects(rects);
             }
         }
     }
 }
 
+static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects, const Document* document)
+{
+    accumulateDocumentTouchEventTargetRects(rects, document, EventHandlerRegistry::TouchEvent);
+    accumulateDocumentTouchEventTargetRects(rects, document, EventHandlerRegistry::TouchMoveEvent);
+}
+
 void ScrollingCoordinator::computeTouchEventTargetRects(LayerHitTestRects& rects)
 {
     TRACE_EVENT0("input", "ScrollingCoordinator::computeTouchEventTargetRects");
     ASSERT(RuntimeEnabledFeatures::touchEnabled());
 
     Document* document = m_page->deprecatedLocalMainFrame()->document();
     if (!document || !document->view())
         return;
 
     accumulateDocumentTouchEventTargetRects(rects, document);
@@ skipping 171 matching lines @@
     bool frameIsScrollable = frameView && frameView->isScrollable();
     if (frameIsScrollable != m_wasFrameScrollable)
         return true;
 
     if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScrolling()) : nullptr)
         return WebSize(frameView->contentsSize()) != scrollLayer->bounds();
     return false;
 }
 
 } // namespace blink