summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webdevtoolsclient_impl.cc
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 16:26:01 +0000
committerjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 16:26:01 +0000
commitf58705418e184e0c42ebb5a264ff25785950cc0a (patch)
tree70a48dd90aeca08579b846e40f2fd4ad02debf92 /webkit/glue/webdevtoolsclient_impl.cc
parent25d238062198d6e683cf33ca1033dd4bf7e9c5e3 (diff)
downloadchromium_src-f58705418e184e0c42ebb5a264ff25785950cc0a.zip
chromium_src-f58705418e184e0c42ebb5a264ff25785950cc0a.tar.gz
chromium_src-f58705418e184e0c42ebb5a264ff25785950cc0a.tar.bz2
Reverting 19489,19488.
Review URL: http://codereview.chromium.org/150024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webdevtoolsclient_impl.cc')
-rw-r--r--webkit/glue/webdevtoolsclient_impl.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 16d19c5..085a0b8 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::context(frame->frame());
+ v8::Handle<v8::Context> frame_context = V8Proxy::GetContext(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::convertDOMWrapperToNode<Node>(args[2]);
+ Node* node = V8Proxy::DOMWrapperToNode<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::convertDOMWrapperToNode<Node>(args[2]);
+ Node* node = V8Proxy::DOMWrapperToNode<Node>(args[2]);
WebDevToolsClientImpl* client = static_cast<WebDevToolsClientImpl*>(
v8::External::Cast(*args.Data())->Value());
client->AddResourceSourceToFrame(resource_id, mime_type, node);