1 files changed, 6 insertions, 139 deletions

diff --git a/WebKit/chromium/src/DebuggerAgentImpl.cpp b/WebKit/chromium/src/DebuggerAgentImpl.cpp
index d592710..5dd5c58 100644
--- a/WebKit/chromium/src/DebuggerAgentImpl.cpp
+++ b/WebKit/chromium/src/DebuggerAgentImpl.cpp
@@ -32,38 +32,21 @@
 #include "DebuggerAgentImpl.h"
 
 #include "DebuggerAgentManager.h"
-#include "Document.h"
-#include "Frame.h"
-#include "Page.h"
-#include "V8Binding.h"
-#include "V8DOMWindow.h"
-#include "V8Index.h"
-#include "V8Proxy.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 WebCore::V8ClassIndex;
-using WebCore::V8DOMWindow;
-using WebCore::V8DOMWrapper;
-using WebCore::V8Proxy;
+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);
@@ -74,125 +57,9 @@ 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_webdevtoolsAgent->forceRepaint();
-}
-
-// static
-void DebuggerAgentImpl::createUtilityContext(Frame* frame, v8::Persistent<v8::Context>* context)
-{
-    v8::HandleScope scope;
-    bool canExecuteScripts = frame->script()->canExecuteScripts();
-
-    // Set up the DOM window as the prototype of the new global object.
-    v8::Handle<v8::Context> windowContext = V8Proxy::context(frame);
-    v8::Handle<v8::Object> windowGlobal;
-    v8::Handle<v8::Object> windowWrapper;
-    if (canExecuteScripts) {
-        // FIXME: This check prevents renderer from crashing, while providing limited capabilities for
-        // DOM inspection, Resources tracking, no scripts support, some timeline profiling. Console will
-        // result in exceptions for each evaluation. There is still some work that needs to be done in
-        // order to polish the script-less experience.
-        windowGlobal = windowContext->Global();
-        windowWrapper = V8DOMWrapper::lookupDOMWrapper(V8DOMWindow::GetTemplate(), windowGlobal);
-        ASSERT(V8DOMWindow::toNative(windowWrapper) == frame->domWindow());
-    }
-
-    v8::Handle<v8::ObjectTemplate> globalTemplate = v8::ObjectTemplate::New();
-
-    // TODO(yurys): provide a function in v8 bindings that would make the
-    // utility context more like main world context of the inspected frame,
-    // otherwise we need to manually make it satisfy various invariants
-    // that V8Proxy::getEntered and some other V8Proxy methods expect to find
-    // on v8 contexts on the contexts stack.
-    // See V8Proxy::createNewContext.
-    //
-    // Install a security handler with V8.
-    globalTemplate->SetAccessCheckCallbacks(
-        V8DOMWindow::namedSecurityCheck,
-        V8DOMWindow::indexedSecurityCheck,
-        v8::Integer::New(V8ClassIndex::DOMWINDOW));
-    // We set number of internal fields to match that in V8DOMWindow wrapper.
-    // See http://crbug.com/28961
-    globalTemplate->SetInternalFieldCount(V8DOMWindow::internalFieldCount);
-
-    *context = v8::Context::New(0 /* no extensions */, globalTemplate, v8::Handle<v8::Object>());
-    v8::Context::Scope contextScope(*context);
-    v8::Handle<v8::Object> global = (*context)->Global();
-
-    v8::Handle<v8::String> implicitProtoString = v8::String::New("__proto__");
-    if (canExecuteScripts)
-        global->Set(implicitProtoString, windowWrapper);
-
-    // Give the code running in the new context a way to get access to the
-    // original context.
-    if (canExecuteScripts)
-        global->Set(v8::String::New("contentWindow"), windowGlobal);
-}
-
-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);
+    m_webdevtoolsAgentClient->sendDebuggerOutput(command);
 }
 
 WebCore::Page* DebuggerAgentImpl::page()