Merge DevTools Refactor CL to Blink36

Source/core/inspector/InspectorController.cpp

 /*
  * Copyright (C) 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/InspectorController.h"
 
 #include "InspectorBackendDispatcher.h"
 #include "InspectorFrontend.h"
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/v8/DOMWrapperWorld.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorApplicationCacheAgent.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorCanvasAgent.h"
 #include "core/inspector/InspectorClient.h"
 #include "core/inspector/InspectorDartAgent.h"
 #include "core/inspector/InspectorDOMAgent.h"
@@ skipping 60 matching lines @@
     m_agents.append(tracingAgentPtr.release());
 
     OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_pageAgent, m_layerTreeAgent,
         overlay, InspectorTimelineAgent::PageInspector, inspectorClient));
     OwnPtr<InspectorDartAgent> dartAgentPtr(InspectorDartAgent::create(m_instrumentingAgents.get(), m_pageAgent, m_state.get()));
     m_dartAgent = dartAgentPtr.get();
     m_agents.append(dartAgentPtr.release());
     m_timelineAgent = timelineAgentPtr.get();
     m_agents.append(timelineAgentPtr.release());
 
-    PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
+    UnifiedScriptDebugServer* unifiedScriptDebugServer = &UnifiedScriptDebugServer::shared();
+    ScriptDebugServer* scriptDebugServer = &PageScriptDebugServer::shared();
 
-    m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDebugServer, m_page, m_pageAgent));
+    m_agents.append(PageRuntimeAgent::create(injectedScriptManager, unifiedScriptDebugServer, m_page, m_pageAgent));
 
     m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_timelineAgent));
 
     m_agents.append(InspectorWorkerAgent::create());
 
     ASSERT_ARG(inspectorClient, inspectorClient);
-    m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), pageScriptDebugServer);
+    m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), scriptDebugServer);
 }
 
 InspectorController::~InspectorController()
 {
 }
 
 PassOwnPtr<InspectorController> InspectorController::create(Page* page, InspectorClient* client)
 {
     return adoptPtr(new InspectorController(page, client));
 }
@@ skipping 22 matching lines @@
     m_agents.append(resourceAgentPtr.release());
 
     m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
 
     m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
 
     m_agents.append(InspectorMemoryAgent::create());
 
     m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
 
-    PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
+    UnifiedScriptDebugServer* unifiedScriptDebugServer = &UnifiedScriptDebugServer::shared();
 
-    OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pageScriptDebugServer, m_pageAgent, injectedScriptManager, overlay));
+    OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(unifiedScriptDebugServer, m_pageAgent, injectedScriptManager, overlay));
     InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
     m_agents.append(debuggerAgentPtr.release());
 
     m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
 
     m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, overlay));
 
     m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager));
 
     m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptManager));
@@ skipping 130 matching lines @@
     Document* document = node->ownerDocument();
     if (!document)
         return;
     LocalFrame* frame = document->frame();
     if (!frame)
         return;
 
     if (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE)
         node = node->parentNode();
 
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(V8ScriptState::forMainWorld(frame));
-    if (injectedScript.isEmpty())
+    V8InjectedScript* injectedScript = static_cast<V8InjectedScript*>(&m_injectedScriptManager->injectedScriptFor(V8ScriptState::forMainWorld(frame)));
+    if (injectedScript->isEmpty())
         return;
-    injectedScript.inspectNode(node);
+    injectedScript->inspectNode(node);
 }
 
 void InspectorController::setInjectedScriptForOrigin(const String& origin, const String& source)
 {
     if (InspectorInspectorAgent* inspectorAgent = m_instrumentingAgents->inspectorInspectorAgent())
         inspectorAgent->setInjectedScriptForOrigin(origin, source);
 }
 
 void InspectorController::dispatchMessageFromFrontend(const String& message)
 {
@@ skipping 143 matching lines @@
         m_layerTreeAgent->willAddPageOverlay(layer);
 }
 
 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer)
 {
     if (m_layerTreeAgent)
         m_layerTreeAgent->didRemovePageOverlay(layer);
 }
 
 } // namespace WebCore