Use upstream V8Proxy and V8Utilities

webkit/glue/devtools/debugger_agent_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 <wtf/HashSet.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
 #include "Document.h"
 #include "Page.h"
+#include "V8Binding.h"
+#include "V8DOMWindow.h"
+#include "V8Index.h"
+#include "V8Proxy.h"
 #undef LOG
 
 #include "base/string_piece.h"
 #include "grit/webkit_resources.h"
-#include "V8Binding.h"
-#include "V8DOMWindow.h"
-#include "V8Index.h"
-#include "v8_binding.h"
-#include "v8_proxy.h"
 #include "webkit/glue/devtools/debugger_agent_impl.h"
 #include "webkit/glue/devtools/debugger_agent_manager.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webview_impl.h"
 
 using WebCore::DOMWindow;
 using WebCore::Document;
 using WebCore::Frame;
@@ skipping 23 matching lines @@
   DebuggerAgentManager::DebugBreak(this);
 }
 
 void DebuggerAgentImpl::GetContextId() {
   delegate_->DidGetContextId(webdevtools_agent_->host_id());
 }
 
 void DebuggerAgentImpl::StartProfiling() {
   v8::HandleScope scope;
   WebCore::V8Proxy* proxy = V8Proxy::retrieve(GetPage()->mainFrame());
-  DCHECK(proxy && proxy->ContextInitialized());
-  v8::Context::Scope context_scope(proxy->GetContext());
+  DCHECK(proxy && proxy->isContextInitialized());
+  v8::Context::Scope context_scope(proxy->context());
   v8::V8::ResumeProfiler();
 }
 
 void DebuggerAgentImpl::StopProfiling() {
   v8::V8::PauseProfiler();
 }
 
 void DebuggerAgentImpl::IsProfilingStarted() {
   delegate_->DidIsProfilingStarted(!v8::V8::IsProfilerPaused());
 }
@@ skipping 21 matching lines @@
     context->Clear();
   }
   if (!document) {
     return;
   }
   v8::HandleScope scope;
 
   // TODO(pfeldman): Validate against Soeren.
   // Set up the DOM window as the prototype of the new global object.
   v8::Handle<v8::Context> window_context =
-      V8Proxy::GetContext(document->frame());
+      V8Proxy::context(document->frame());
   v8::Handle<v8::Object> window_global = window_context->Global();
   v8::Handle<v8::Value> window_wrapper =
-      V8Proxy::LookupDOMWrapper(V8ClassIndex::DOMWINDOW, window_global);
+      V8Proxy::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, window_global);
 
-  ASSERT(V8Proxy::DOMWrapperToNative<DOMWindow>(window_wrapper) ==
+  ASSERT(V8Proxy::convertDOMWrapperToNative<DOMWindow>(window_wrapper) ==
       document->frame()->domWindow());
 
   // Create a new environment using an empty template for the shadow
   // object.  Reuse the global object if one has been created earlier.
   v8::Handle<v8::ObjectTemplate> global_template =
       V8DOMWindow::GetShadowObjectTemplate();
 
   // Install a security handler with V8.
   global_template->SetAccessCheckCallbacks(
       V8Custom::v8DOMWindowNamedSecurityCheck,
@@ skipping 56 matching lines @@
     return "";
   } else {
     v8::Handle<v8::String> res_json = v8::Handle<v8::String>::Cast(res_obj);
     return WebCore::toWebCoreString(res_json);
   }
 }
 
 WebCore::Page* DebuggerAgentImpl::GetPage() {
   return web_view_impl_->page();
 }