Merge DevTools Refactor CL to Blink36

Source/core/inspector/PageDebuggerAgent.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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/PageDebuggerAgent.h"
 
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/v8/DOMWrapperWorld.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/ScriptSourceCode.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectorOverlay.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/Page.h"
 
 namespace WebCore {
 
-PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
+PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(UnifiedScriptDebugServer* unifiedScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
 {
-    return adoptPtr(new PageDebuggerAgent(pageScriptDebugServer, pageAgent, injectedScriptManager, overlay));
+    return adoptPtr(new PageDebuggerAgent(unifiedScriptDebugServer, pageAgent, injectedScriptManager, overlay));
 }
 
-PageDebuggerAgent::PageDebuggerAgent(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
+PageDebuggerAgent::PageDebuggerAgent(UnifiedScriptDebugServer* unifiedScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
     : InspectorDebuggerAgent(injectedScriptManager)
-    , m_pageScriptDebugServer(pageScriptDebugServer)
+    , m_unifiedScriptDebugServer(unifiedScriptDebugServer)
     , m_pageAgent(pageAgent)
     , m_overlay(overlay)
 {
+    ASSERT(m_unifiedScriptDebugServer);
     m_overlay->overlayHost()->setListener(this);
 }
 
 PageDebuggerAgent::~PageDebuggerAgent()
 {
 }
 
 void PageDebuggerAgent::enable()
 {
     InspectorDebuggerAgent::enable();
     m_instrumentingAgents->setPageDebuggerAgent(this);
 }
 
 void PageDebuggerAgent::disable()
 {
     InspectorDebuggerAgent::disable();
     m_instrumentingAgents->setPageDebuggerAgent(0);
 }
 
 void PageDebuggerAgent::startListeningScriptDebugServer()
 {
-    scriptDebugServer().addListener(this, m_pageAgent->page());
+    m_unifiedScriptDebugServer->addListener(this, m_pageAgent->page());
 }
 
 void PageDebuggerAgent::stopListeningScriptDebugServer()
 {
-    scriptDebugServer().removeListener(this, m_pageAgent->page());
+    m_unifiedScriptDebugServer->removeListener(this, m_pageAgent->page());
 }
 
-PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
+ScriptDebugServerBase& PageDebuggerAgent::scriptDebugServer()
 {
-    return *m_pageScriptDebugServer;
+    return *m_unifiedScriptDebugServer;
 }
 
 void PageDebuggerAgent::muteConsole()
 {
     FrameConsole::mute();
 }
 
 void PageDebuggerAgent::unmuteConsole()
 {
     FrameConsole::unmute();
 }
 
 void PageDebuggerAgent::overlayResumed()
 {
     ErrorString error;
     resume(&error);
 }
 
 void PageDebuggerAgent::overlaySteppedOver()
 {
     ErrorString error;
     stepOver(&error, 0);
 }
 
-InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
+InjectedScript& PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
 {
     if (!executionContextId) {
         ScriptState* scriptState = V8ScriptState::forMainWorld(m_pageAgent->mainFrame());
         return injectedScriptManager()->injectedScriptFor(scriptState);
     }
-    InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
+    InjectedScript& injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
     if (injectedScript.isEmpty())
         *errorString = "Execution context with given id not found.";
     return injectedScript;
 }
 
 void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message)
 {
     m_overlay->setPausedInDebuggerMessage(message);
 }
 
 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     if (frame != m_pageAgent->mainFrame())
         return;
 
     reset();
 
     scriptDebugServer().setPreprocessorSource(String());
     ASSERT(m_pageAgent);
     if (!m_pageAgent->scriptPreprocessorSource().isEmpty())
         scriptDebugServer().setPreprocessorSource(m_pageAgent->scriptPreprocessorSource());
 }
 
 String PageDebuggerAgent::preprocessEventListener(LocalFrame* frame, const String& source, const String& url, const String& functionName)
 {
     ASSERT(frame);
-    ASSERT(m_pageScriptDebugServer);
-    return m_pageScriptDebugServer->preprocessEventListener(frame, source, url, functionName);
+    return m_unifiedScriptDebugServer->preprocessEventListener(frame, source, url, functionName);
 }
 
 PassOwnPtr<ScriptSourceCode> PageDebuggerAgent::preprocess(LocalFrame* frame, const ScriptSourceCode& sourceCode)
 {
-    ASSERT(m_pageScriptDebugServer);
     ASSERT(frame);
-    return m_pageScriptDebugServer->preprocess(frame, sourceCode);
+    return m_unifiedScriptDebugServer->preprocess(frame, sourceCode);
 }
 
 void PageDebuggerAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)
 {
     LocalFrame* mainFrame = frame->page()->mainFrame();
     if (loader->frame() == mainFrame)
         pageDidCommitLoad();
 }
 
 } // namespace WebCore