Revert of [DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl

third_party/WebKit/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 236 matching lines @@
 
     void unmuteWarningsAndDeprecations()
     {
         FrameConsole::unmute();
         UseCounter::unmuteForInspector();
     }
 };
 
 class DebuggerTask : public InspectorTaskRunner::Task {
 public:
-    DebuggerTask(int sessionId, PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
-        : m_sessionId(sessionId)
-        , m_descriptor(descriptor)
+    DebuggerTask(PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
+        : m_descriptor(descriptor)
     {
     }
 
     ~DebuggerTask() override {}
     virtual void run()
     {
         WebDevToolsAgent* webagent = m_descriptor->agent();
         if (!webagent)
             return;
 
         WebDevToolsAgentImpl* agentImpl = static_cast<WebDevToolsAgentImpl*>(webagent);
         if (agentImpl->m_attached)
-            agentImpl->dispatchMessageFromFrontend(m_sessionId, m_descriptor->message());
+            agentImpl->dispatchMessageFromFrontend(m_descriptor->message());
     }
 
 private:
-    int m_sessionId;
     OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
 };
 
 // static
 PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLocalFrameImpl* frame, WebDevToolsAgentClient* client)
 {
     WebViewImpl* view = frame->viewImpl();
     // TODO(dgozman): sometimes view->mainFrameImpl() does return null, even though |frame| is meant to be main frame.
     // See http://crbug.com/526162.
     bool isMainFrame = view && !frame->parent();
@@ skipping 39 matching lines @@
     , m_inspectorAgent(nullptr)
     , m_domAgent(nullptr)
     , m_pageAgent(nullptr)
     , m_resourceAgent(nullptr)
     , m_layerTreeAgent(nullptr)
     , m_tracingAgent(nullptr)
     , m_pageRuntimeAgent(nullptr)
     , m_pageConsoleAgent(nullptr)
     , m_agents(m_instrumentingAgents.get(), m_state.get())
     , m_deferredAgentsInitialized(false)
-    , m_sessionId(0)
 {
     ASSERT(isMainThread());
     ASSERT(m_webLocalFrameImpl->frame());
 
     long processId = Platform::current()->getUniqueIdForProcess();
     ASSERT(processId > 0);
     IdentifiersFactory::setProcessId(processId);
     InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
 
     OwnPtrWillBeRawPtr<InspectorInspectorAgent> inspectorAgentPtr(InspectorInspectorAgent::create(injectedScriptManager));
@@ skipping 146 matching lines @@
 
     if (m_overlay)
         m_overlay->init(cssAgent, debuggerAgent, m_domAgent.get());
 }
 
 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
 {
     m_agents.append(agent);
 }
 
-void WebDevToolsAgentImpl::attach(const WebString& hostId, int sessionId)
+void WebDevToolsAgentImpl::attach(const WebString& hostId)
 {
     if (m_attached)
         return;
 
     // Set the attached bit first so that sync notifications were delivered.
     m_attached = true;
-    m_sessionId = sessionId;
 
     initializeDeferredAgents();
     m_resourceAgent->setHostId(hostId);
 
     m_inspectorFrontend = adoptPtr(new InspectorFrontend(this));
     // We can reconnect to existing front-end -> unmute state.
     m_state->unmute();
     m_agents.setFrontend(m_inspectorFrontend.get());
 
     InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
     InspectorInstrumentation::frontendCreated();
 
     m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(this);
     m_agents.registerInDispatcher(m_inspectorBackendDispatcher.get());
 
     Platform::current()->currentThread()->addTaskObserver(this);
 }
 
-void WebDevToolsAgentImpl::reattach(const WebString& hostId, int sessionId, const WebString& savedState)
+void WebDevToolsAgentImpl::reattach(const WebString& hostId, const WebString& savedState)
 {
     if (m_attached)
         return;
 
-    attach(hostId, sessionId);
+    attach(hostId);
     m_state->loadFromCookie(savedState);
     m_agents.restore();
 }
 
 void WebDevToolsAgentImpl::detach()
 {
     if (!m_attached)
         return;
 
     Platform::current()->currentThread()->removeTaskObserver(this);
 
     m_inspectorBackendDispatcher->clearFrontend();
     m_inspectorBackendDispatcher.clear();
 
     // Destroying agents would change the state, but we don't want that.
     // Pre-disconnect state will be used to restore inspector agents.
     m_state->mute();
     m_agents.clearFrontend();
     m_inspectorFrontend.clear();
 
     // Release overlay resources.
     if (m_overlay)
         m_overlay->clear();
     InspectorInstrumentation::frontendDeleted();
     InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
 
-    m_sessionId = 0;
     m_attached = false;
 }
 
 void WebDevToolsAgentImpl::continueProgram()
 {
     ClientMessageLoopAdapter::continueProgram();
 }
 
 void WebDevToolsAgentImpl::didCommitLoadForLocalFrame(LocalFrame* frame)
 {
@@ skipping 24 matching lines @@
 void WebDevToolsAgentImpl::enableTracing(const String& categoryFilter)
 {
     m_client->enableTracing(categoryFilter);
 }
 
 void WebDevToolsAgentImpl::disableTracing()
 {
     m_client->disableTracing();
 }
 
-void WebDevToolsAgentImpl::dispatchOnInspectorBackend(int sessionId, const WebString& message)
+void WebDevToolsAgentImpl::dispatchOnInspectorBackend(const WebString& message)
 {
     if (!m_attached)
         return;
     if (WebDevToolsAgent::shouldInterruptForMessage(message))
         MainThreadDebugger::instance()->taskRunner()->runPendingTasks();
     else
-        dispatchMessageFromFrontend(sessionId, message);
+        dispatchMessageFromFrontend(message);
 }
 
-void WebDevToolsAgentImpl::dispatchMessageFromFrontend(int sessionId, const String& message)
+void WebDevToolsAgentImpl::dispatchMessageFromFrontend(const String& message)
 {
     InspectorTaskRunner::IgnoreInterruptsScope scope(MainThreadDebugger::instance()->taskRunner());
     if (m_inspectorBackendDispatcher)
-        m_inspectorBackendDispatcher->dispatch(sessionId, message);
+        m_inspectorBackendDispatcher->dispatch(message);
 }
 
 void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& pointInRootFrame)
 {
     HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::ReadOnly | HitTestRequest::AllowChildFrameContent;
     HitTestRequest request(hitType);
     WebMouseEvent dummyEvent;
     dummyEvent.type = WebInputEvent::MouseDown;
     dummyEvent.x = pointInRootFrame.x;
     dummyEvent.y = pointInRootFrame.y;
     IntPoint transformedPoint = PlatformMouseEventBuilder(m_webLocalFrameImpl->frameView(), dummyEvent).position();
     HitTestResult result(request, m_webLocalFrameImpl->frameView()->rootFrameToContents(transformedPoint));
     m_webLocalFrameImpl->frame()->contentLayoutObject()->hitTest(result);
     Node* node = result.innerNode();
     if (!node && m_webLocalFrameImpl->frame()->document())
         node = m_webLocalFrameImpl->frame()->document()->documentElement();
     m_domAgent->inspect(node);
 }
 
-void WebDevToolsAgentImpl::sendProtocolResponse(int sessionId, int callId, PassRefPtr<JSONObject> message)
+void WebDevToolsAgentImpl::sendProtocolResponse(int callId, PassRefPtr<JSONObject> message)
 {
     if (!m_attached)
         return;
     flushPendingProtocolNotifications();
-    m_client->sendProtocolMessage(sessionId, callId, message->toJSONString(), m_stateCookie);
+    m_client->sendProtocolMessage(callId, message->toJSONString(), m_stateCookie);
     m_stateCookie = String();
 }
 
 void WebDevToolsAgentImpl::sendProtocolNotification(PassRefPtr<JSONObject> message)
 {
     if (!m_attached)
         return;
-    m_notificationQueue.append(std::make_pair(m_sessionId, message));
+    m_notificationQueue.append(message);
 }
 
 void WebDevToolsAgentImpl::flush()
 {
     flushPendingProtocolNotifications();
 }
 
 void WebDevToolsAgentImpl::updateInspectorStateCookie(const String& state)
 {
     m_stateCookie = state;
@@ skipping 12 matching lines @@
 WebString WebDevToolsAgentImpl::evaluateInWebInspectorOverlay(const WebString& script)
 {
     if (!m_overlay)
         return WebString();
 
     return m_overlay->evaluateInOverlayForTest(script);
 }
 
 void WebDevToolsAgentImpl::flushPendingProtocolNotifications()
 {
-    if (m_attached) {
-        m_agents.flushPendingProtocolNotifications();
-        for (size_t i = 0; i < m_notificationQueue.size(); ++i)
-            m_client->sendProtocolMessage(m_notificationQueue[i].first, 0, m_notificationQueue[i].second->toJSONString(), WebString());
-    }
+    if (!m_attached)
+        return;
+
+    m_agents.flushPendingProtocolNotifications();
+    for (size_t i = 0; i < m_notificationQueue.size(); ++i)
+        m_client->sendProtocolMessage(0, m_notificationQueue[i]->toJSONString(), WebString());
     m_notificationQueue.clear();
 }
 
 void WebDevToolsAgentImpl::willProcessTask()
 {
     if (!m_attached)
         return;
     if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspectorProfilerAgent())
         profilerAgent->willProcessTask();
 }
 
 void WebDevToolsAgentImpl::didProcessTask()
 {
     if (!m_attached)
         return;
     if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspectorProfilerAgent())
         profilerAgent->didProcessTask();
     flushPendingProtocolNotifications();
 }
 
-void WebDevToolsAgent::interruptAndDispatch(int sessionId, MessageDescriptor* rawDescriptor)
+void WebDevToolsAgent::interruptAndDispatch(MessageDescriptor* rawDescriptor)
 {
     // rawDescriptor can't be a PassOwnPtr because interruptAndDispatch is a WebKit API function.
     OwnPtr<MessageDescriptor> descriptor = adoptPtr(rawDescriptor);
-    OwnPtr<DebuggerTask> task = adoptPtr(new DebuggerTask(sessionId, descriptor.release()));
+    OwnPtr<DebuggerTask> task = adoptPtr(new DebuggerTask(descriptor.release()));
     MainThreadDebugger::interruptMainThreadAndRun(task.release());
 }
 
 bool WebDevToolsAgent::shouldInterruptForMessage(const WebString& message)
 {
     String commandName;
     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