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/webdevtoolsclient_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/webdevtoolsclient_impl.cc')
| -rw-r--r-- | webkit/glue/webdevtoolsclient_impl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc index 085a0b8..16d19c5 100644 --- a/webkit/glue/webdevtoolsclient_impl.cc +++ b/webkit/glue/webdevtoolsclient_impl.cc @@ -14,14 +14,14 @@ #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" @@ -149,7 +149,7 @@ WebDevToolsClientImpl::WebDevToolsClientImpl( 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", @@ -253,7 +253,7 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame( 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(); } @@ -272,7 +272,7 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddResourceSourceToFrame( 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); |