diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 15:31:53 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 15:31:53 +0000 |
| commit | 162daa054276523dcbab30cb6c227f16abfd9c3b (patch) | |
| tree | fee6a2aef24156a90f3918d36e052a525321dde1 /webkit/glue/devtools/debugger_agent_impl.cc | |
| parent | d5d7ebfc24f9a90183cc8bfd16243d604b35730f (diff) | |
| download | chromium_src-162daa054276523dcbab30cb6c227f16abfd9c3b.zip chromium_src-162daa054276523dcbab30cb6c227f16abfd9c3b.tar.gz chromium_src-162daa054276523dcbab30cb6c227f16abfd9c3b.tar.bz2 | |
Use upstream V8Proxy and V8Utilities
BUG=15459
TEST=none
Review URL: http://codereview.chromium.org/149086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/devtools/debugger_agent_impl.cc')
| -rw-r--r-- | webkit/glue/devtools/debugger_agent_impl.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc index 4312cbe..dfbe7bc 100644 --- a/webkit/glue/devtools/debugger_agent_impl.cc +++ b/webkit/glue/devtools/debugger_agent_impl.cc @@ -10,15 +10,14 @@ #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" @@ -62,8 +61,8 @@ void DebuggerAgentImpl::GetContextId() { 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(); } @@ -105,12 +104,12 @@ void DebuggerAgentImpl::ResetUtilityContext( // 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 |