Merge WebKit at r65072 : Initial merge by git.

Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585

1 files changed, 4 insertions, 54 deletions

diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
index 592a532..c1b09c4 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
@@ -35,8 +35,6 @@
 #include "ContextMenuController.h"
 #include "ContextMenuItem.h"
 #include "DOMWindow.h"
-#include "DebuggerAgent.h"
-#include "DevToolsRPCJS.h"
 #include "Document.h"
 #include "Event.h"
 #include "Frame.h"
@@ -48,10 +46,8 @@
 #include "Page.h"
 #include "Pasteboard.h"
 #include "PlatformString.h"
-#include "ProfilerAgent.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
-#include "ToolsAgent.h"
 #include "V8Binding.h"
 #include "V8DOMWrapper.h"
 #include "V8InspectorFrontendHost.h"
@@ -78,10 +74,6 @@ static v8::Local<v8::String> ToV8String(const String& s)
     return v8::String::New(reinterpret_cast<const uint16_t*>(s.characters()), s.length());
 }
 
-DEFINE_RPC_JS_BOUND_OBJ(DebuggerAgent, DEBUGGER_AGENT_STRUCT, DebuggerAgentDelegate, DEBUGGER_AGENT_DELEGATE_STRUCT)
-DEFINE_RPC_JS_BOUND_OBJ(ProfilerAgent, PROFILER_AGENT_STRUCT, ProfilerAgentDelegate, PROFILER_AGENT_DELEGATE_STRUCT)
-DEFINE_RPC_JS_BOUND_OBJ(ToolsAgent, TOOLS_AGENT_STRUCT, ToolsAgentDelegate, TOOLS_AGENT_DELEGATE_STRUCT)
-
 WebDevToolsFrontend* WebDevToolsFrontend::create(
     WebView* view,
     WebDevToolsFrontendClient* client,
@@ -113,16 +105,9 @@ WebDevToolsFrontendImpl::WebDevToolsFrontendImpl(
     v8::HandleScope scope;
     v8::Handle<v8::Context> frameContext = V8Proxy::context(frame->frame());
 
-    m_debuggerAgentObj.set(new JSDebuggerAgentBoundObj(this, frameContext, "RemoteDebuggerAgent"));
-    m_profilerAgentObj.set(new JSProfilerAgentBoundObj(this, frameContext, "RemoteProfilerAgent"));
-    m_toolsAgentObj.set(new JSToolsAgentBoundObj(this, frameContext, "RemoteToolsAgent"));
-
     // Debugger commands should be sent using special method.
     BoundObject debuggerCommandExecutorObj(frameContext, this, "RemoteDebuggerCommandExecutor");
     debuggerCommandExecutorObj.addProtoFunction(
-        "DebuggerCommand",
-        WebDevToolsFrontendImpl::jsDebuggerCommand);
-    debuggerCommandExecutorObj.addProtoFunction(
         "DebuggerPauseScript",
         WebDevToolsFrontendImpl::jsDebuggerPauseScript);
     debuggerCommandExecutorObj.build();
@@ -132,33 +117,7 @@ WebDevToolsFrontendImpl::~WebDevToolsFrontendImpl()
 {
 }
 
-void WebDevToolsFrontendImpl::dispatchMessageFromAgent(const WebDevToolsMessageData& data)
-{
-    Vector<String> v;
-    v.append(data.className);
-    v.append(data.methodName);
-    for (size_t i = 0; i < data.arguments.size(); i++)
-        v.append(data.arguments[i]);
-    if (!m_loaded) {
-        m_pendingIncomingMessages.append(v);
-        return;
-    }
-    executeScript(v);
-}
-
-void WebDevToolsFrontendImpl::frontendLoaded()
-{
-    m_loaded = true;
-
-    for (Vector<Vector<String> >::iterator it = m_pendingIncomingMessages.begin();
-         it != m_pendingIncomingMessages.end();
-         ++it) {
-        executeScript(*it);
-    }
-    m_pendingIncomingMessages.clear();
-}
-
-void WebDevToolsFrontendImpl::executeScript(const Vector<String>& v)
+void WebDevToolsFrontendImpl::dispatchOnInspectorFrontend(const WebString& message)
 {
     WebFrameImpl* frame = m_webViewImpl->mainFrameImpl();
     v8::HandleScope scope;
@@ -168,24 +127,15 @@ void WebDevToolsFrontendImpl::executeScript(const Vector<String>& v)
     ASSERT(dispatchFunction->IsFunction());
     v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(dispatchFunction);
     Vector< v8::Handle<v8::Value> > args;
-    for (size_t i = 0; i < v.size(); i++)
-        args.append(ToV8String(v.at(i)));
+    args.append(ToV8String(message));
     v8::TryCatch tryCatch;
     tryCatch.SetVerbose(true);
     function->Call(frameContext->Global(), args.size(), args.data());
 }
 
-void WebDevToolsFrontendImpl::sendRpcMessage(const WebDevToolsMessageData& data)
-{
-    m_client->sendMessageToAgent(data);
-}
-
-v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsDebuggerCommand(const v8::Arguments& args)
+void WebDevToolsFrontendImpl::frontendLoaded()
 {
-    WebDevToolsFrontendImpl* frontend = static_cast<WebDevToolsFrontendImpl*>(v8::External::Cast(*args.Data())->Value());
-    WebString command = WebCore::toWebCoreStringWithNullCheck(args[0]);
-    frontend->m_client->sendDebuggerCommandToAgent(command);
-    return v8::Undefined();
+    m_client->sendFrontendLoaded();
 }
 
 v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsDebuggerPauseScript(const v8::Arguments& args)