1 files changed, 6 insertions, 80 deletions

diff --git a/WebKit/chromium/src/DebuggerAgentImpl.cpp b/WebKit/chromium/src/DebuggerAgentImpl.cpp
index dde9e1d..46c6e7c 100644
--- a/WebKit/chromium/src/DebuggerAgentImpl.cpp
+++ b/WebKit/chromium/src/DebuggerAgentImpl.cpp
@@ -32,32 +32,21 @@
 #include "DebuggerAgentImpl.h"
 
 #include "DebuggerAgentManager.h"
-#include "Document.h"
-#include "Frame.h"
-#include "Page.h"
-#include "ScriptDebugServer.h"
-#include "V8Binding.h"
+#include "WebDevToolsAgentClient.h"
 #include "WebDevToolsAgentImpl.h"
 #include "WebViewImpl.h"
-#include <wtf/HashSet.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
 
-using WebCore::DOMWindow;
-using WebCore::Document;
-using WebCore::Frame;
-using WebCore::Page;
-using WebCore::String;
+using WTF::String;
 
 namespace WebKit {
 
 DebuggerAgentImpl::DebuggerAgentImpl(
     WebViewImpl* webViewImpl,
-    DebuggerAgentDelegate* delegate,
-    WebDevToolsAgentImpl* webdevtoolsAgent)
+    WebDevToolsAgentImpl* webdevtoolsAgent,
+    WebDevToolsAgentClient* webdevtoolsAgentClient)
     : m_webViewImpl(webViewImpl)
-    , m_delegate(delegate)
     , m_webdevtoolsAgent(webdevtoolsAgent)
+    , m_webdevtoolsAgentClient(webdevtoolsAgentClient)
     , m_autoContinueOnException(false)
 {
     DebuggerAgentManager::debugAttach(this);
@@ -68,75 +57,12 @@ DebuggerAgentImpl::~DebuggerAgentImpl()
     DebuggerAgentManager::debugDetach(this);
 }
 
-void DebuggerAgentImpl::getContextId()
-{
-    m_delegate->setContextId(m_webdevtoolsAgent->hostId());
-}
-
-void DebuggerAgentImpl::processDebugCommands()
-{
-    DebuggerAgentManager::UtilityContextScope utilityScope;
-    v8::Debug::ProcessDebugMessages();
-}
-
 void DebuggerAgentImpl::debuggerOutput(const String& command)
 {
-    m_delegate->debuggerOutput(command);
+    m_webdevtoolsAgentClient->sendDebuggerOutput(command);
     m_webdevtoolsAgent->forceRepaint();
 }
 
-String DebuggerAgentImpl::executeUtilityFunction(
-    v8::Handle<v8::Context> context,
-    int callId,
-    const char* object,
-    const String &functionName,
-    const String& jsonArgs,
-    bool async,
-    String* exception)
-{
-    v8::HandleScope scope;
-    ASSERT(!context.IsEmpty());
-    if (context.IsEmpty()) {
-        *exception = "No window context.";
-        return "";
-    }
-    v8::Context::Scope contextScope(context);
-
-    DebuggerAgentManager::UtilityContextScope utilityScope;
-
-    v8::Handle<v8::Object> dispatchObject = v8::Handle<v8::Object>::Cast(
-        context->Global()->Get(v8::String::New(object)));
-
-    v8::Handle<v8::Value> dispatchFunction = dispatchObject->Get(v8::String::New("dispatch"));
-    ASSERT(dispatchFunction->IsFunction());
-    v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(dispatchFunction);
-
-    v8::Handle<v8::String> functionNameWrapper = v8::Handle<v8::String>(
-        v8::String::New(functionName.utf8().data()));
-    v8::Handle<v8::String> jsonArgsWrapper = v8::Handle<v8::String>(
-        v8::String::New(jsonArgs.utf8().data()));
-    v8::Handle<v8::Number> callIdWrapper = v8::Handle<v8::Number>(
-        v8::Number::New(async ? callId : 0));
-
-    v8::Handle<v8::Value> args[] = {
-        functionNameWrapper,
-        jsonArgsWrapper,
-        callIdWrapper
-    };
-
-    v8::TryCatch tryCatch;
-    v8::Handle<v8::Value> resObj = function->Call(context->Global(), 3, args);
-    if (tryCatch.HasCaught()) {
-        v8::Local<v8::Message> message = tryCatch.Message();
-        if (message.IsEmpty())
-            *exception = "Unknown exception";
-        else
-            *exception = WebCore::toWebCoreString(message->Get());
-        return "";
-    }
-    return WebCore::toWebCoreStringWithNullCheck(resObj);
-}
-
 WebCore::Page* DebuggerAgentImpl::page()
 {
     return m_webViewImpl->page();