diff options
author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-31 07:16:15 +0000 |
---|---|---|
committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-31 07:16:15 +0000 |
commit | 5188f21e93ebc212a8033ffb3133e1ce003effd9 (patch) | |
tree | 7e14e76e7b9a8b585916b31776fb3206ff50ec1f | |
parent | 0d4d2919e311cc5531307af864bba7f18a83c682 (diff) | |
download | chromium_src-5188f21e93ebc212a8033ffb3133e1ce003effd9.zip chromium_src-5188f21e93ebc212a8033ffb3133e1ce003effd9.tar.gz chromium_src-5188f21e93ebc212a8033ffb3133e1ce003effd9.tar.bz2 |
DevTools upstreaming: rename Js* to JS*
BUG=28062
Review URL: http://codereview.chromium.org/556075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37656 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | webkit/glue/devtools/devtools_rpc.h | 16 | ||||
-rw-r--r-- | webkit/glue/devtools/devtools_rpc_js.h | 24 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsagent_impl.cc | 8 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsagent_impl.h | 4 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.cc | 6 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.h | 17 |
6 files changed, 37 insertions, 38 deletions
diff --git a/webkit/glue/devtools/devtools_rpc.h b/webkit/glue/devtools/devtools_rpc.h index 4879a6f..4de64ac 100644 --- a/webkit/glue/devtools/devtools_rpc.h +++ b/webkit/glue/devtools/devtools_rpc.h @@ -47,8 +47,8 @@ // // class MyApi { // private: -// MyApi() {} -// ~MyApi() {} +// MyApi() { } +// ~MyApi() { } // virtual void method1() = 0; // virtual void method2( // int param1, @@ -60,7 +60,7 @@ // 2. MyApiStub will implement MyApi interface and would serialize all calls // into the string-based calls of the underlying transport: // -// DevToolsRpc::Delegate* transport; +// DevToolsRPC::Delegate* transport; // myApi = new MyApiStub(transport); // myApi->method1(); // myApi->method3(2); @@ -322,9 +322,9 @@ public: \ \ class Class##Stub \ : public Class \ - , public DevToolsRpc { \ + , public DevToolsRPC { \ public: \ - explicit Class##Stub(Delegate* delegate) : DevToolsRpc(delegate) { } \ + explicit Class##Stub(Delegate* delegate) : DevToolsRPC(delegate) { } \ virtual ~Class##Stub() { } \ typedef Class CLASS; \ STRUCT( \ @@ -364,7 +364,7 @@ public: \ /////////////////////////////////////////////////////// // RPC base class -class DevToolsRpc { +class DevToolsRPC { public: class Delegate { public: @@ -373,8 +373,8 @@ public: virtual void sendRpcMessage(const WebKit::WebDevToolsMessageData& data) = 0; }; - explicit DevToolsRpc(Delegate* delegate) : m_delegate(delegate) { } - virtual ~DevToolsRpc() { }; + explicit DevToolsRPC(Delegate* delegate) : m_delegate(delegate) { } + virtual ~DevToolsRPC() { }; protected: void sendRpcMessage(const String& className, diff --git a/webkit/glue/devtools/devtools_rpc_js.h b/webkit/glue/devtools/devtools_rpc_js.h index 36d6dd2..159f9be 100644 --- a/webkit/glue/devtools/devtools_rpc_js.h +++ b/webkit/glue/devtools/devtools_rpc_js.h @@ -66,37 +66,37 @@ namespace WebKit { #define TOOLS_RPC_JS_STUB_METHOD0(Method) \ static v8::Handle<v8::Value> js##Method(const v8::Arguments& args) { \ - sendRpcMessageFromJs(#Method, args, 0); \ + sendRpcMessageFromJS(#Method, args, 0); \ return v8::Undefined(); \ } #define TOOLS_RPC_JS_STUB_METHOD1(Method, T1) \ static v8::Handle<v8::Value> js##Method(const v8::Arguments& args) { \ - sendRpcMessageFromJs(#Method, args, 1); \ + sendRpcMessageFromJS(#Method, args, 1); \ return v8::Undefined(); \ } #define TOOLS_RPC_JS_STUB_METHOD2(Method, T1, T2) \ static v8::Handle<v8::Value> js##Method(const v8::Arguments& args) { \ - sendRpcMessageFromJs(#Method, args, 2); \ + sendRpcMessageFromJS(#Method, args, 2); \ return v8::Undefined(); \ } #define TOOLS_RPC_JS_STUB_METHOD3(Method, T1, T2, T3) \ static v8::Handle<v8::Value> js##Method(const v8::Arguments& args) { \ - sendRpcMessageFromJs(#Method, args, 3); \ + sendRpcMessageFromJS(#Method, args, 3); \ return v8::Undefined(); \ } #define TOOLS_RPC_JS_STUB_METHOD4(Method, T1, T2, T3, T4) \ static v8::Handle<v8::Value> js##Method(const v8::Arguments& args) { \ - sendRpcMessageFromJs(#Method, args, 4); \ + sendRpcMessageFromJS(#Method, args, 4); \ return v8::Undefined(); \ } #define TOOLS_RPC_JS_STUB_METHOD5(Method, T1, T2, T3, T4, T5) \ static v8::Handle<v8::Value> js##Method(const v8::Arguments& args) { \ - sendRpcMessageFromJs(#Method, args, 5); \ + sendRpcMessageFromJS(#Method, args, 5); \ return v8::Undefined(); \ } @@ -104,9 +104,9 @@ namespace WebKit { // JS RPC main obj macro #define DEFINE_RPC_JS_BOUND_OBJ(Class, STRUCT, DClass, DELEGATE_STRUCT) \ -class Js##Class##BoundObj : public Class##Stub { \ +class JS##Class##BoundObj : public Class##Stub { \ public: \ - Js##Class##BoundObj(Delegate* rpcDelegate, \ + JS##Class##BoundObj(Delegate* rpcDelegate, \ v8::Handle<v8::Context> context, \ const char* classname) \ : Class##Stub(rpcDelegate) { \ @@ -120,8 +120,8 @@ public: \ TOOLS_RPC_JS_BIND_METHOD5) \ boundObj.build(); \ } \ - virtual ~Js##Class##BoundObj() {} \ - typedef Js##Class##BoundObj OCLASS; \ + virtual ~JS##Class##BoundObj() { } \ + typedef JS##Class##BoundObj OCLASS; \ STRUCT( \ TOOLS_RPC_JS_STUB_METHOD0, \ TOOLS_RPC_JS_STUB_METHOD1, \ @@ -130,7 +130,7 @@ public: \ TOOLS_RPC_JS_STUB_METHOD4, \ TOOLS_RPC_JS_STUB_METHOD5) \ private: \ - static void sendRpcMessageFromJs(const char* method, \ + static void sendRpcMessageFromJS(const char* method, \ const v8::Arguments& jsArguments, \ size_t argsCount) \ { \ @@ -138,7 +138,7 @@ private: \ for (size_t i = 0; i < argsCount; i++) \ args[i] = WebCore::toWebCoreStringWithNullCheck(jsArguments[i]); \ void* selfPtr = v8::External::Cast(*jsArguments.Data())->Value(); \ - Js##Class##BoundObj* self = static_cast<Js##Class##BoundObj*>(selfPtr); \ + JS##Class##BoundObj* self = static_cast<JS##Class##BoundObj*>(selfPtr); \ self->sendRpcMessage(#Class, method, args); \ } \ }; diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc index b75c45e..0f23741 100644 --- a/webkit/glue/webdevtoolsagent_impl.cc +++ b/webkit/glue/webdevtoolsagent_impl.cc @@ -126,10 +126,10 @@ static const char kApuAgentFeatureName[] = "apu-agent"; static const char kTimelineFeatureName[] = "timeline-profiler"; static const char kResourceTrackingFeatureName[] = "resource-tracking"; -class IoRpcDelegate : public DevToolsRpc::Delegate, public Noncopyable { +class IORPCDelegate : public DevToolsRPC::Delegate, public Noncopyable { public: - IoRpcDelegate() {} - virtual ~IoRpcDelegate() {} + IORPCDelegate() { } + virtual ~IORPCDelegate() { } virtual void sendRpcMessage(const WebKit::WebDevToolsMessageData& data) { WebDevToolsAgentClient::sendMessageToFrontendOnIOThread(data); @@ -563,7 +563,7 @@ void WebDevToolsAgent::setMessageLoopDispatchHandler(MessageLoopDispatchHandler bool WebDevToolsAgent::dispatchMessageFromFrontendOnIOThread(const WebDevToolsMessageData& data) { - IoRpcDelegate transport; + IORPCDelegate transport; ProfilerAgentDelegateStub stub(&transport); ProfilerAgentImpl agent(&stub); return ProfilerAgentDispatch::dispatch(&agent, data); diff --git a/webkit/glue/webdevtoolsagent_impl.h b/webkit/glue/webdevtoolsagent_impl.h index 02b9f48..09906fc 100644 --- a/webkit/glue/webdevtoolsagent_impl.h +++ b/webkit/glue/webdevtoolsagent_impl.h @@ -65,7 +65,7 @@ namespace WebKit { class WebDevToolsAgentImpl : public WebKit::WebDevToolsAgentPrivate, public ToolsAgent, - public DevToolsRpc::Delegate { + public DevToolsRPC::Delegate { public: WebDevToolsAgentImpl(WebKit::WebViewImpl* webViewImpl, WebKit::WebDevToolsAgentClient* client); virtual ~WebDevToolsAgentImpl(); @@ -104,7 +104,7 @@ public: virtual void didFinishLoading(unsigned long); virtual void didFailLoading(unsigned long, const WebKit::WebURLError&); - // DevToolsRpc::Delegate implementation. + // DevToolsRPC::Delegate implementation. virtual void sendRpcMessage(const WebKit::WebDevToolsMessageData& data); void forceRepaint(); diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc index 34c23c0..5814e32 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.cc +++ b/webkit/glue/webdevtoolsfrontend_impl.cc @@ -112,9 +112,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")); + 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"); diff --git a/webkit/glue/webdevtoolsfrontend_impl.h b/webkit/glue/webdevtoolsfrontend_impl.h index 36d705e..69a74c8 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.h +++ b/webkit/glue/webdevtoolsfrontend_impl.h @@ -54,16 +54,15 @@ namespace WebCore { namespace WebKit { - class JsDebuggerAgentBoundObj; - class JsNetAgentBoundObj; - class JsProfilerAgentBoundObj; - class JsToolsAgentBoundObj; + class JSDebuggerAgentBoundObj; + class JSProfilerAgentBoundObj; + class JSToolsAgentBoundObj; class WebDevToolsClientDelegate; class WebViewImpl; struct WebDevToolsMessageData; class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend - , public DevToolsRpc::Delegate + , public DevToolsRPC::Delegate , public Noncopyable { public: WebDevToolsFrontendImpl( @@ -72,7 +71,7 @@ public: const String& applicationLocale); virtual ~WebDevToolsFrontendImpl(); - // DevToolsRpc::Delegate implementation. + // DevToolsRPC::Delegate implementation. virtual void sendRpcMessage(const WebKit::WebDevToolsMessageData& data); // WebDevToolsFrontend implementation. @@ -152,9 +151,9 @@ private: WebKit::WebViewImpl* m_webViewImpl; WebKit::WebDevToolsFrontendClient* m_client; String m_applicationLocale; - OwnPtr<JsDebuggerAgentBoundObj> m_debuggerAgentObj; - OwnPtr<JsProfilerAgentBoundObj> m_profilerAgentObj; - OwnPtr<JsToolsAgentBoundObj> m_toolsAgentObj; + OwnPtr<JSDebuggerAgentBoundObj> m_debuggerAgentObj; + OwnPtr<JSProfilerAgentBoundObj> m_profilerAgentObj; + OwnPtr<JSToolsAgentBoundObj> m_toolsAgentObj; bool m_loaded; Vector<Vector<String> > m_pendingIncomingMessages; RefPtr<MenuProvider> m_menuProvider; |