Move compositor InputHandler from RenderViewImpl to RenderWidget.

third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp

Index: third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
diff --git a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
index f30bf1cc3d93cc278d730bbbcc82956933a72687..8695bc1ae3da699bebe44e66fd440b7f4ed63613 100644
--- a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
+++ b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
@@ -119,8 +119,12 @@ void EventHandlerRegistry::updateEventHandlerInternal(
   bool targetSetChanged = updateEventHandlerTargets(op, handlerClass, target);
   bool hasHandlers = m_targets[handlerClass].size();
 
-  if (hadHandlers != hasHandlers)
-    notifyHasHandlersChanged(handlerClass, hasHandlers);
+  if (hadHandlers != hasHandlers) {
+    LocalFrame* frame = nullptr;
+    if (Node* node = target->toNode())
+      frame = node->document().frame();

[dcheng, 2016/11/04 21:00:02]

Do we not care if the EventTarget is a non-node type?

[wjmaclean, 2016/11/07 15:57:27]

I don't think so. In the past this has always been applied, by ChromeClientImpl,
to the mainFrame, which (I'm assuming) will have a Node representation. I'm not
sure what this would mean if EventTarget wasn't a Node ... is there a case for
that?

[dcheng, 2016/11/08 18:11:00]

I did some research, and this is used for LocalDOMWindow as well. Do we need to
handle that case?

[wjmaclean, 2016/11/09 18:09:38]

I suppose we could always fall back to the main frame in that case. The only
question is, if the main frame isn't local, then the old codepath falls back to
the render view for the remote main frame ... I assume we would want to do the
same in this case? It might be worth experimenting with *not* doing that though
...

+    notifyHasHandlersChanged(frame, handlerClass, hasHandlers);
+  }
 
   if (targetSetChanged)
     notifyDidAddOrRemoveEventHandlerTarget(handlerClass);
@@ -210,6 +214,7 @@ void EventHandlerRegistry::didRemoveAllEventHandlers(EventTarget& target) {
 }
 
 void EventHandlerRegistry::notifyHasHandlersChanged(
+    LocalFrame* frame,
     EventHandlerClass handlerClass,
     bool hasActiveHandlers) {
   switch (handlerClass) {
@@ -219,14 +224,14 @@ void EventHandlerRegistry::notifyHasHandlersChanged(
     case WheelEventBlocking:
     case WheelEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::MouseWheel,
+          frame, WebEventListenerClass::MouseWheel,
           webEventListenerProperties(hasEventHandlers(WheelEventBlocking),
                                      hasEventHandlers(WheelEventPassive)));
       break;
     case TouchStartOrMoveEventBlocking:
     case TouchStartOrMoveEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::TouchStartOrMove,
+          frame, WebEventListenerClass::TouchStartOrMove,
           webEventListenerProperties(
               hasEventHandlers(TouchStartOrMoveEventBlocking),
               hasEventHandlers(TouchStartOrMoveEventPassive)));
@@ -234,7 +239,7 @@ void EventHandlerRegistry::notifyHasHandlersChanged(
     case TouchEndOrCancelEventBlocking:
     case TouchEndOrCancelEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::TouchEndOrCancel,
+          frame, WebEventListenerClass::TouchEndOrCancel,
           webEventListenerProperties(
               hasEventHandlers(TouchEndOrCancelEventBlocking),
               hasEventHandlers(TouchEndOrCancelEventPassive)));