Use upstream V8Proxy and V8Utilities

webkit/glue/webdevtoolsclient_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include <string>
 
 #include "Document.h"
 #include "DOMWindow.h"
 #include "Frame.h"
 #include "InspectorController.h"
 #include "Node.h"
 #include "Page.h"
 #include "PlatformString.h"
 #include "SecurityOrigin.h"
+#include "V8Binding.h"
+#include "V8CustomBinding.h"
+#include "V8Proxy.h"
+#include "V8Utilities.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 #undef LOG
 
-#include "V8Binding.h"
-#include "V8CustomBinding.h"
-#include "v8_proxy.h"
-#include "v8_utility.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/glue/devtools/bound_object.h"
 #include "webkit/glue/devtools/debugger_agent.h"
 #include "webkit/glue/devtools/devtools_rpc_js.h"
 #include "webkit/glue/devtools/dom_agent.h"
 #include "webkit/glue/devtools/tools_agent.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsclient_delegate.h"
@@ skipping 107 matching lines @@
   // Debugger commands should be sent using special method.
   debugger_command_executor_obj_.set(new RemoteDebuggerCommandExecutor(
       delegate, frame, L"RemoteDebuggerCommandExecutor"));
   debugger_agent_obj_.set(new JsDebuggerAgentBoundObj(
       this, frame, L"RemoteDebuggerAgent"));
   dom_agent_obj_.set(new JsDomAgentBoundObj(this, frame, L"RemoteDomAgent"));
   tools_agent_obj_.set(
       new JsToolsAgentBoundObj(this, frame, L"RemoteToolsAgent"));
 
   v8::HandleScope scope;
-  v8::Handle<v8::Context> frame_context = V8Proxy::GetContext(frame->frame());
+  v8::Handle<v8::Context> frame_context = V8Proxy::context(frame->frame());
   dev_tools_host_.set(new BoundObject(frame_context, this, "DevToolsHost"));
   dev_tools_host_->AddProtoFunction(
       "reset",
       WebDevToolsClientImpl::JsReset);
   dev_tools_host_->AddProtoFunction(
       "addSourceToFrame",
       WebDevToolsClientImpl::JsAddSourceToFrame);
   dev_tools_host_->AddProtoFunction(
       "addResourceSourceToFrame",
       WebDevToolsClientImpl::JsAddResourceSourceToFrame);
@@ skipping 83 matching lines @@
   v8::TryCatch exception_catcher;
 
   String mime_type = WebCore::toWebCoreStringWithNullCheck(args[0]);
   if (mime_type.isEmpty() || exception_catcher.HasCaught()) {
     return v8::Undefined();
   }
   String source_string = WebCore::toWebCoreStringWithNullCheck(args[1]);
   if (source_string.isEmpty() || exception_catcher.HasCaught()) {
     return v8::Undefined();
   }
-  Node* node = V8Proxy::DOMWrapperToNode<Node>(args[2]);
+  Node* node = V8Proxy::convertDOMWrapperToNode<Node>(args[2]);
   if (!node || !node->attached()) {
     return v8::Undefined();
   }
 
   Page* page = V8Proxy::retrieveFrameForEnteredContext()->page();
   InspectorController* inspectorController = page->inspectorController();
   return WebCore::v8Boolean(inspectorController->
       addSourceToFrame(mime_type, source_string, node));
 }
 
 // static
 v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddResourceSourceToFrame(
     const v8::Arguments& args) {
   int resource_id = static_cast<int>(args[0]->NumberValue());
   String mime_type = WebCore::toWebCoreStringWithNullCheck(args[1]);
   if (mime_type.isEmpty()) {
     return v8::Undefined();
   }
-  Node* node = V8Proxy::DOMWrapperToNode<Node>(args[2]);
+  Node* node = V8Proxy::convertDOMWrapperToNode<Node>(args[2]);
   WebDevToolsClientImpl* client = static_cast<WebDevToolsClientImpl*>(
       v8::External::Cast(*args.Data())->Value());
   client->AddResourceSourceToFrame(resource_id, mime_type, node);
   return v8::Undefined();
 }
 
 // static
 v8::Handle<v8::Value> WebDevToolsClientImpl::JsLoaded(
     const v8::Arguments& args) {
   WebDevToolsClientImpl* client = static_cast<WebDevToolsClientImpl*>(
@@ skipping 28 matching lines @@
 v8::Handle<v8::Value> WebDevToolsClientImpl::JsGetPlatform(
     const v8::Arguments& args) {
 #if defined OS_MACOSX
   return v8String("mac-leopard");
 #elif defined OS_LINUX
   return v8String("linux");
 #else
   return v8String("windows");
 #endif
 }