[DevTools] Cleanup after moving input to browser.

Source/web/WebDevToolsAgentImpl.cpp

 /*
  * Copyright (C) 2010-2011 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 82 matching lines @@
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 #include "wtf/MathExtras.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/ProcessID.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-namespace {
-
-class InspectorInputClient : public InspectorInputAgent::Client {
-public:
-    explicit InspectorInputClient(WebViewImpl* webViewImpl) : m_webViewImpl(webViewImpl) { }
-    ~InspectorInputClient() override { }
-
-    // InspectorInputAgent::Client implementation.
-    void dispatchKeyEvent(const PlatformKeyboardEvent& event) override
-    {
-        if (!m_webViewImpl->page()->focusController().isFocused())
-            m_webViewImpl->setFocus(true);
-
-        WebKeyboardEvent webEvent = WebKeyboardEventBuilder(event);
-        if (!webEvent.keyIdentifier[0] && webEvent.type != WebInputEvent::Char)
-            webEvent.setKeyIdentifierFromWindowsKeyCode();
-        m_webViewImpl->handleInputEvent(webEvent);
-    }
-
-    void dispatchMouseEvent(const PlatformMouseEvent& event) override
-    {
-        if (!m_webViewImpl->page()->focusController().isFocused())
-            m_webViewImpl->setFocus(true);
-
-        WebMouseEvent webEvent = WebMouseEventBuilder(m_webViewImpl->mainFrameImpl()->frameView(), event);
-        m_webViewImpl->handleInputEvent(webEvent);
-    }
-
-private:
-    WebViewImpl* m_webViewImpl;
-};
-
-} // namespace
-
 class ClientMessageLoopAdapter : public PageScriptDebugServer::ClientMessageLoop {
 public:
     ~ClientMessageLoopAdapter() override
     {
         s_instance = nullptr;
     }
 
     static void ensurePageScriptDebugServerCreated(WebDevToolsAgentClient* client)
     {
         if (s_instance)
@@ skipping 136 matching lines @@
 private:
     OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
 };
 
 // static
 PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLocalFrameImpl* frame, WebDevToolsAgentClient* client)
 {
     WebViewImpl* view = frame->viewImpl();
     bool isMainFrame = view && view->mainFrameImpl() == frame;
     if (!isMainFrame)
-        return adoptPtrWillBeNoop(new WebDevToolsAgentImpl(frame, client, frame->inspectorOverlay(), nullptr));
+        return adoptPtrWillBeNoop(new WebDevToolsAgentImpl(frame, client, frame->inspectorOverlay()));
 
-    WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, view->inspectorOverlay(), adoptPtr(new InspectorInputClient(view)));
+    WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, view->inspectorOverlay());
     agent->registerAgent(InspectorRenderingAgent::create(view));
     agent->registerAgent(InspectorEmulationAgent::create(view));
     // TODO(dgozman): migrate each of the following agents to frame once module is ready.
     agent->registerAgent(InspectorDatabaseAgent::create(view->page()));
     agent->registerAgent(DeviceOrientationInspectorAgent::create(view->page()));
     agent->registerAgent(InspectorFileSystemAgent::create(view->page()));
     agent->registerAgent(InspectorIndexedDBAgent::create(view->page()));
     agent->registerAgent(InspectorAccessibilityAgent::create(view->page()));
     agent->registerAgent(InspectorDOMStorageAgent::create(view->page()));
     return adoptPtrWillBeNoop(agent);
 }
 
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
     WebLocalFrameImpl* webLocalFrameImpl,
     WebDevToolsAgentClient* client,
-    InspectorOverlay* overlay,
-    PassOwnPtr<InspectorInputAgent::Client> inputClient)
+    InspectorOverlay* overlay)
     : m_client(client)
     , m_webLocalFrameImpl(webLocalFrameImpl)
     , m_attached(false)
 #if ENABLE(ASSERT)
     , m_hasBeenDisposed(false)
 #endif
     , m_instrumentingAgents(m_webLocalFrameImpl->frame()->instrumentingAgents())
     , m_injectedScriptManager(InjectedScriptManager::createForPage())
     , m_state(adoptPtrWillBeNoop(new InspectorCompositeState(this)))
     , m_overlay(overlay)
-    , m_inputClient(inputClient)
     , m_cssAgent(nullptr)
     , m_resourceAgent(nullptr)
     , m_layerTreeAgent(nullptr)
     , m_agents(m_instrumentingAgents.get(), m_state.get())
     , m_deferredAgentsInitialized(false)
 {
     ASSERT(isMainThread());
     ASSERT(m_webLocalFrameImpl->frame());
 
     long processId = WTF::getCurrentProcessID();
@@ skipping 124 matching lines @@
 
     m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
 
     OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(PageScriptDebugServer::instance(), m_pageAgent, injectedScriptManager, m_overlay, m_pageRuntimeAgent->debuggerId()));
     InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
     m_agents.append(debuggerAgentPtr.release());
     m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent, m_instrumentingAgents.get()));
 
     m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
 
-    m_agents.append(InspectorInputAgent::create(m_pageAgent, m_inputClient.get()));
+    m_agents.append(InspectorInputAgent::create(m_pageAgent));
 
     m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, m_overlay));
 
     m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager));
 
     m_pageAgent->setDeferredAgents(debuggerAgent, m_cssAgent);
 
     PageScriptDebugServer* scriptDebugServer = PageScriptDebugServer::instance();
     m_injectedScriptManager->injectedScriptHost()->init(
         m_pageConsoleAgent.get(),
@@ skipping 269 matching lines @@
     if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
         return false;
     return commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_pauseCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointByUrlCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_removeBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointsActiveCmd);
 }
 
 } // namespace blink