Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 5 insertions, 17 deletions

diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.h b/WebKit/chromium/src/WebDevToolsFrontendImpl.h
index fa4707d..e4f22fe 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.h
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.h
@@ -31,9 +31,10 @@
 #ifndef WebDevToolsFrontendImpl_h
 #define WebDevToolsFrontendImpl_h
 
-#include "DevToolsRPC.h"
+#include "PlatformString.h"
 #include "WebDevToolsFrontend.h"
 #include <v8.h>
+#include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
@@ -44,20 +45,17 @@ namespace WebCore {
 class ContextMenuItem;
 class Node;
 class Page;
-class String;
 }
 
 namespace WebKit {
 
-class JSDebuggerAgentBoundObj;
-class JSProfilerAgentBoundObj;
-class JSToolsAgentBoundObj;
 class WebDevToolsClientDelegate;
 class WebViewImpl;
 struct WebDevToolsMessageData;
 
+using WTF::String;
+
 class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend
-                              , public DevToolsRPC::Delegate
                               , public Noncopyable {
 public:
     WebDevToolsFrontendImpl(
@@ -66,28 +64,18 @@ public:
         const String& applicationLocale);
     virtual ~WebDevToolsFrontendImpl();
 
-    // DevToolsRPC::Delegate implementation.
-    virtual void sendRpcMessage(const WebKit::WebDevToolsMessageData& data);
-
     // WebDevToolsFrontend implementation.
-    virtual void dispatchMessageFromAgent(const WebKit::WebDevToolsMessageData& data);
+    virtual void dispatchOnInspectorFrontend(const WebString& message);
 
     void frontendLoaded();
 
 private:
-    void executeScript(const Vector<String>& v);
-
-    static v8::Handle<v8::Value> jsDebuggerCommand(const v8::Arguments& args);
     static v8::Handle<v8::Value> jsDebuggerPauseScript(const v8::Arguments& args);
 
     WebKit::WebViewImpl* m_webViewImpl;
     WebKit::WebDevToolsFrontendClient* m_client;
     String m_applicationLocale;
-    OwnPtr<JSDebuggerAgentBoundObj> m_debuggerAgentObj;
-    OwnPtr<JSProfilerAgentBoundObj> m_profilerAgentObj;
-    OwnPtr<JSToolsAgentBoundObj> m_toolsAgentObj;
     bool m_loaded;
-    Vector<Vector<String> > m_pendingIncomingMessages;
 };
 
 } // namespace WebKit