Move compositor InputHandler from RenderViewImpl to RenderWidget.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/EventHandlerRegistry.h"
 
 #include "core/events/EventListenerOptions.h"
 #include "core/events/EventUtil.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 101 matching lines @@
 }
 
 void EventHandlerRegistry::updateEventHandlerInternal(
     ChangeOperation op,
     EventHandlerClass handlerClass,
     EventTarget* target) {
   bool hadHandlers = m_targets[handlerClass].size();
   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);
 }
 
 void EventHandlerRegistry::updateEventHandlerOfType(
     ChangeOperation op,
     const AtomicString& eventType,
     const AddEventListenerOptions& options,
     EventTarget* target) {
@@ skipping 69 matching lines @@
 }
 
 void EventHandlerRegistry::didRemoveAllEventHandlers(EventTarget& target) {
   for (size_t i = 0; i < EventHandlerClassCount; ++i) {
     EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
     updateEventHandlerInternal(RemoveAll, handlerClass, &target);
   }
 }
 
 void EventHandlerRegistry::notifyHasHandlersChanged(
+    LocalFrame* frame,
     EventHandlerClass handlerClass,
     bool hasActiveHandlers) {
   switch (handlerClass) {
     case ScrollEvent:
       m_frameHost->chromeClient().setHasScrollEventHandlers(hasActiveHandlers);
       break;
     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)));
       break;
     case TouchEndOrCancelEventBlocking:
     case TouchEndOrCancelEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::TouchEndOrCancel,
+          frame, WebEventListenerClass::TouchEndOrCancel,
           webEventListenerProperties(
               hasEventHandlers(TouchEndOrCancelEventBlocking),
               hasEventHandlers(TouchEndOrCancelEventPassive)));
       break;
 #if ENABLE(ASSERT)
     case EventsForTesting:
       break;
 #endif
     default:
       ASSERT_NOT_REACHED();
@@ skipping 80 matching lines @@
         ASSERT(window->frame());
         ASSERT(window->frame()->host());
         ASSERT(window->frame()->host() == m_frameHost);
       }
     }
   }
 #endif  // ENABLE(ASSERT)
 }
 
 }  // namespace blink