From 89cee33bd33769684e2261f6d79446dafdbdcf7c Mon Sep 17 00:00:00 2001 From: "dcarney@google.com" Date: Thu, 28 Nov 2013 16:47:24 +0000 Subject: Remove usages of deprecated v8 apis in extensions in content/renderer TBR=jochen@chromium.org BUG=324225 Review URL: https://codereview.chromium.org/95533002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237804 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/web_ui_extension.cc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'content/renderer/web_ui_extension.cc') diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc index 2675f39..f887e9d 100644 --- a/content/renderer/web_ui_extension.cc +++ b/content/renderer/web_ui_extension.cc @@ -48,7 +48,8 @@ class WebUIExtensionWrapper : public v8::Extension { WebUIExtensionWrapper(); virtual ~WebUIExtensionWrapper(); - virtual v8::Handle GetNativeFunction( + virtual v8::Handle GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Handle name) OVERRIDE; static void Send(const v8::FunctionCallbackInfo& args); static void GetVariableValue(const v8::FunctionCallbackInfo& args); @@ -65,12 +66,13 @@ WebUIExtensionWrapper::WebUIExtensionWrapper() WebUIExtensionWrapper::~WebUIExtensionWrapper() {} -v8::Handle WebUIExtensionWrapper::GetNativeFunction( - v8::Handle name) { - if (name->Equals(v8::String::New("Send"))) - return v8::FunctionTemplate::New(Send); - if (name->Equals(v8::String::New("GetVariableValue"))) - return v8::FunctionTemplate::New(GetVariableValue); +v8::Handle +WebUIExtensionWrapper::GetNativeFunctionTemplate(v8::Isolate* isolate, + v8::Handle name) { + if (name->Equals(v8::String::NewFromUtf8(isolate, "Send"))) + return v8::FunctionTemplate::New(isolate, Send); + if (name->Equals(v8::String::NewFromUtf8(isolate, "GetVariableValue"))) + return v8::FunctionTemplate::New(isolate, GetVariableValue); return v8::Handle(); } @@ -155,7 +157,10 @@ void WebUIExtensionWrapper::GetVariableValue( std::string key = *v8::String::Utf8Value(args[0]->ToString()); std::string value = WebUIExtensionData::Get(render_view)->GetValue(key); - args.GetReturnValue().Set(v8::String::New(value.c_str(), value.length())); + args.GetReturnValue().Set(v8::String::NewFromUtf8(args.GetIsolate(), + value.c_str(), + v8::String::kNormalString, + value.length())); } // static -- cgit v1.1