[DevTools] Create last agents on attach, modify InspectorDatabaseAgent to support it.

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 82 matching lines @@
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 #include "wtf/MathExtras.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
+namespace {
+
+bool isMainFrame(WebLocalFrameImpl* frame)
+{
+    // TODO(dgozman): sometimes view->mainFrameImpl() does return null, even though |frame| is meant to be main frame.
+    // See http://crbug.com/526162.
+    return frame->viewImpl() && !frame->parent();
+}
+
+}
+
 class ClientMessageLoopAdapter : public MainThreadDebugger::ClientMessageLoop {
 public:
     ~ClientMessageLoopAdapter() override
     {
         s_instance = nullptr;
     }
 
     static void ensureMainThreadDebuggerCreated(WebDevToolsAgentClient* client)
     {
         if (s_instance)
@@ skipping 148 matching lines @@
     FrozenViewsSet m_frozenViews;
     WebFrameWidgetsSet m_frozenWidgets;
     static ClientMessageLoopAdapter* s_instance;
 };
 
 ClientMessageLoopAdapter* ClientMessageLoopAdapter::s_instance = nullptr;
 
 // static
 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();
-    if (!isMainFrame) {
-        WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, nullptr);
+    if (!isMainFrame(frame)) {
+        WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, nullptr, false);
         if (frame->frameWidget())
             agent->layerTreeViewChanged(toWebFrameWidgetImpl(frame->frameWidget())->layerTreeView());
         return agent;
     }
 
-    WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, InspectorOverlay::create(view));
-    // TODO(dgozman): we should actually pass the view instead of frame, but during
-    // remote->local transition we cannot access mainFrameImpl() yet, so we have to store the
-    // frame which will become the main frame later.
-    agent->m_agents.append(InspectorRenderingAgent::create(frame, agent->m_overlay.get()));
-    agent->m_agents.append(InspectorEmulationAgent::create(frame, agent));
-    // TODO(dgozman): migrate each of the following agents to frame once module is ready.
-    agent->m_agents.append(InspectorDatabaseAgent::create(view->page()));
-    agent->m_agents.append(DeviceOrientationInspectorAgent::create(view->page()));
-    agent->m_agents.append(InspectorAccessibilityAgent::create(view->page()));
-    agent->m_agents.append(InspectorDOMStorageAgent::create(view->page()));
-    agent->m_agents.append(InspectorCacheStorageAgent::create());
+    WebViewImpl* view = frame->viewImpl();
+    WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, InspectorOverlay::create(view), true);
     agent->layerTreeViewChanged(view->layerTreeView());
     return agent;
 }
 
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
     WebLocalFrameImpl* webLocalFrameImpl,
     WebDevToolsAgentClient* client,
-    InspectorOverlay* overlay)
+    InspectorOverlay* overlay,
+    bool includeViewAgents)
     : m_client(client)
     , m_webLocalFrameImpl(webLocalFrameImpl)
     , m_attached(false)
 #if DCHECK_IS_ON()
     , m_hasBeenDisposed(false)
 #endif
     , m_instrumentingAgents(m_webLocalFrameImpl->frame()->instrumentingAgents())
     , m_resourceContentLoader(InspectorResourceContentLoader::create(m_webLocalFrameImpl->frame()))
     , m_overlay(overlay)
     , m_inspectedFrames(InspectedFrames::create(m_webLocalFrameImpl->frame()))
     , m_domAgent(nullptr)
     , m_pageAgent(nullptr)
     , m_resourceAgent(nullptr)
     , m_layerTreeAgent(nullptr)
     , m_tracingAgent(nullptr)
     , m_agents(m_instrumentingAgents.get())
     , m_deferredAgentsInitialized(false)
+    , m_includeViewAgents(includeViewAgents)
     , m_sessionId(0)
     , m_stateMuted(false)
     , m_layerTreeId(0)
 {
     DCHECK(isMainThread());
     DCHECK(m_webLocalFrameImpl->frame());
 }
 
 WebDevToolsAgentImpl::~WebDevToolsAgentImpl()
 {
@@ skipping 111 matching lines @@
     m_agents.append(InspectorProfilerAgent::create(m_v8Session->profilerAgent(), m_overlay.get()));
 
     m_agents.append(InspectorHeapProfilerAgent::create(isolate, m_v8Session->heapProfilerAgent()));
 
     InspectorPageAgent* pageAgent = InspectorPageAgent::create(m_inspectedFrames.get(), this, m_resourceContentLoader.get(), debuggerAgent);
     m_pageAgent = pageAgent;
     m_agents.append(pageAgent);
 
     runtimeAgent->setClearConsoleCallback(bind<>(&InspectorConsoleAgent::clearAllMessages, pageConsoleAgent));
     m_tracingAgent->setLayerTreeId(m_layerTreeId);
+
+    if (m_includeViewAgents) {
+        // TODO(dgozman): we should actually pass the view instead of frame, but during
+        // remote->local transition we cannot access mainFrameImpl() yet, so we have to store the
+        // frame which will become the main frame later.
+        m_agents.append(InspectorRenderingAgent::create(m_webLocalFrameImpl, m_overlay.get()));
+        m_agents.append(InspectorEmulationAgent::create(m_webLocalFrameImpl, this));
+        // TODO(dgozman): migrate each of the following agents to frame once module is ready.
+        Page* page = m_webLocalFrameImpl->viewImpl()->page();
+        m_agents.append(InspectorDatabaseAgent::create(page));
+        m_agents.append(DeviceOrientationInspectorAgent::create(page));
+        m_agents.append(InspectorAccessibilityAgent::create(page));
+        m_agents.append(InspectorDOMStorageAgent::create(page));
+        m_agents.append(InspectorCacheStorageAgent::create());
+    }
+
     if (m_overlay)
         m_overlay->init(cssAgent, debuggerAgent, m_domAgent);
 }
 
 void WebDevToolsAgentImpl::attach(const WebString& hostId, int sessionId)
 {
     if (m_attached)
         return;
 
     // Set the attached bit first so that sync notifications were delivered.
@@ skipping 259 matching lines @@
     if (!protocol::Dispatcher::getCommandName(message, &commandName))
         return false;
     return commandName == "Debugger.pause"
         || commandName == "Debugger.setBreakpoint"
         || commandName == "Debugger.setBreakpointByUrl"
         || commandName == "Debugger.removeBreakpoint"
         || commandName == "Debugger.setBreakpointsActive";
 }
 
 } // namespace blink