Move compositor InputHandler from RenderViewImpl to RenderWidget.

third_party/WebKit/Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 897 matching lines @@
   String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" +
                    dialogMessage + "') during " +
                    dismissalTypeToString(dismissalType) + ".";
   m_webView->mainFrame()->addMessageToConsole(
       WebConsoleMessage(WebConsoleMessage::LevelError, message));
 
   return false;
 }
 
 void ChromeClientImpl::setEventListenerProperties(
+    LocalFrame* frame,
     WebEventListenerClass eventClass,
     WebEventListenerProperties properties) {
-  if (WebLayerTreeView* treeView = m_webView->layerTreeView()) {
+  WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
+  if (!webFrame || webFrame->localRoot() == m_webView->mainFrame()) {
+    setEventListenerProperties(m_webView->layerTreeView(), eventClass,
+                               properties);
+  } else {
+    WebWidgetClient* client = WebLocalFrameImpl::fromFrame(frame)
+                                  ->localRoot()
+                                  ->frameWidget()
+                                  ->client();
+    // TODO(wjmaclean): Do we need to inform the WebView about these also?
+    setEventListenerProperties(client->layerTreeView(), eventClass, properties);
+  }
+}
+
+void ChromeClientImpl::setEventListenerProperties(
+    WebLayerTreeView* treeView,
+    WebEventListenerClass eventClass,
+    WebEventListenerProperties properties) {
+  if (treeView) {
     treeView->setEventListenerProperties(eventClass, properties);
     if (eventClass == WebEventListenerClass::TouchStartOrMove) {
       m_webView->hasTouchEventHandlers(
           properties != WebEventListenerProperties::Nothing ||
-          eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) !=
+          eventListenerProperties(treeView,
+                                  WebEventListenerClass::TouchEndOrCancel) !=
               WebEventListenerProperties::Nothing);
     } else if (eventClass == WebEventListenerClass::TouchEndOrCancel) {
       m_webView->hasTouchEventHandlers(
           properties != WebEventListenerProperties::Nothing ||
-          eventListenerProperties(WebEventListenerClass::TouchStartOrMove) !=
+          eventListenerProperties(treeView,
+                                  WebEventListenerClass::TouchStartOrMove) !=
               WebEventListenerProperties::Nothing);
     }
   } else {
     m_webView->hasTouchEventHandlers(true);
   }
 }
 
 void ChromeClientImpl::beginLifecycleUpdates() {
   if (WebLayerTreeView* treeView = m_webView->layerTreeView()) {
     treeView->setDeferCommits(false);
     treeView->setNeedsBeginFrame();
   }
 }
 
 WebEventListenerProperties ChromeClientImpl::eventListenerProperties(
+    LocalFrame* frame,
     WebEventListenerClass eventClass) const {
-  if (WebLayerTreeView* treeView = m_webView->layerTreeView())
+  WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
+  if (!webFrame || webFrame->localRoot() == m_webView->mainFrame())
+    return eventListenerProperties(m_webView->layerTreeView(), eventClass);
+
+  WebWidgetClient* client =
+      WebLocalFrameImpl::fromFrame(frame)->localRoot()->frameWidget()->client();
+  return eventListenerProperties(client->layerTreeView(), eventClass);
+}
+
+WebEventListenerProperties ChromeClientImpl::eventListenerProperties(
+    WebLayerTreeView* treeView,
+    WebEventListenerClass eventClass) const {
+  if (treeView)
     return treeView->eventListenerProperties(eventClass);
   return WebEventListenerProperties::Nothing;
 }
 
 void ChromeClientImpl::setHasScrollEventHandlers(bool hasEventHandlers) {
   if (WebLayerTreeView* treeView = m_webView->layerTreeView())
     treeView->setHaveScrollEventHandlers(hasEventHandlers);
 }
 
 bool ChromeClientImpl::hasScrollEventHandlers() const {
@@ skipping 197 matching lines @@
   if (RuntimeEnabledFeatures::presentationEnabled())
     PresentationController::provideTo(frame, client->presentationClient());
   if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
     provideAudioOutputDeviceClientTo(frame,
                                      AudioOutputDeviceClientImpl::create());
   if (RuntimeEnabledFeatures::installedAppEnabled())
     InstalledAppController::provideTo(frame, client->installedAppClient());
 }
 
 }  // namespace blink