Move compositor InputHandler from RenderViewImpl to RenderWidget.

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 145 matching lines @@
 
   void* webView() const override { return m_popup->m_webView; }
 
   IntSize minimumWindowSize() const override { return IntSize(0, 0); }
 
   void setCursor(const Cursor& cursor, LocalFrame* localFrame) override {
     m_popup->m_widgetClient->didChangeCursor(WebCursorInfo(cursor));
   }
 
   void setEventListenerProperties(
+      LocalFrame* frame,
       WebEventListenerClass eventClass,
       WebEventListenerProperties properties) override {
-    if (m_popup->m_layerTreeView) {
-      m_popup->m_layerTreeView->setEventListenerProperties(eventClass,
-                                                           properties);
+    DCHECK(frame->isMainFrame());
+    WebWidgetClient* client = m_popup->widgetClient();
+    if (WebLayerTreeView* layerTreeView = m_popup->m_layerTreeView) {
+      layerTreeView->setEventListenerProperties(eventClass, properties);
       if (eventClass == WebEventListenerClass::TouchStartOrMove) {
-        m_popup->widgetClient()->hasTouchEventHandlers(
+        client->hasTouchEventHandlers(
             properties != WebEventListenerProperties::Nothing ||
-            eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) !=
+            eventListenerProperties(frame,
+                                    WebEventListenerClass::TouchEndOrCancel) !=
                 WebEventListenerProperties::Nothing);
       } else if (eventClass == WebEventListenerClass::TouchEndOrCancel) {
-        m_popup->widgetClient()->hasTouchEventHandlers(
+        client->hasTouchEventHandlers(
             properties != WebEventListenerProperties::Nothing ||
-            eventListenerProperties(WebEventListenerClass::TouchStartOrMove) !=
+            eventListenerProperties(frame,
+                                    WebEventListenerClass::TouchStartOrMove) !=
                 WebEventListenerProperties::Nothing);
       }
     } else {
-      m_popup->widgetClient()->hasTouchEventHandlers(true);
+      client->hasTouchEventHandlers(true);
     }
   }
   WebEventListenerProperties eventListenerProperties(
+      LocalFrame*,
       WebEventListenerClass eventClass) const override {
-    if (m_popup->m_layerTreeView)
+    if (m_popup->m_layerTreeView) {
       return m_popup->m_layerTreeView->eventListenerProperties(eventClass);
+    }
     return WebEventListenerProperties::Nothing;
   }
 
-  void setHasScrollEventHandlers(bool hasEventHandlers) override {
+  void setHasScrollEventHandlers(LocalFrame* frame,
+                                 bool hasEventHandlers) override {
+    DCHECK(frame->isMainFrame());
     if (m_popup->m_layerTreeView)
       m_popup->m_layerTreeView->setHaveScrollEventHandlers(hasEventHandlers);
   }
 
-  bool hasScrollEventHandlers() const override {
-    if (m_popup->m_layerTreeView)
-      return m_popup->m_layerTreeView->haveScrollEventHandlers();
-    return false;
-  }
-
   void setTouchAction(LocalFrame* frame, TouchAction touchAction) override {
     DCHECK(frame);
     WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
     WebFrameWidgetBase* widget = webFrame->localRoot()->frameWidget();
     if (!widget)
       return;
 
     if (WebWidgetClient* client = widget->client())
       client->setTouchAction(static_cast<WebTouchAction>(touchAction));
   }
@@ skipping 384 matching lines @@
   // A WebPagePopupImpl instance usually has two references.
   //  - One owned by the instance itself. It represents the visible widget.
   //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
   //    WebPagePopupImpl to close.
   // We need them because the closing operation is asynchronous and the widget
   // can be closed while the WebViewImpl is unaware of it.
   return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 }  // namespace blink