| Index: chrome/renderer/extensions/console.cc
|
| diff --git a/chrome/renderer/extensions/console.cc b/chrome/renderer/extensions/console.cc
|
| index 009d665b22bef9c81aab89628441271c1c92f203..97fc49c665c3d01dd74b17295d413acf895f47ed 100644
|
| --- a/chrome/renderer/extensions/console.cc
|
| +++ b/chrome/renderer/extensions/console.cc
|
| @@ -72,9 +72,9 @@ void BoundLogMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| for (int i = 0; i < info.Length(); ++i) {
|
| if (i > 0)
|
| message += " ";
|
| - message += *v8::String::AsciiValue(info[i]);
|
| + message += *v8::String::Utf8Value(info[i]);
|
| }
|
| - (*log_method)(v8::Context::GetCalling(), message);
|
| + (*log_method)(info.GetIsolate()->GetCallingContext(), message);
|
| }
|
|
|
| void BindLogMethod(v8::Isolate* isolate,
|
| @@ -175,13 +175,13 @@ void AddMessage(v8::Handle<v8::Context> context,
|
|
|
| v8::Local<v8::Object> AsV8Object() {
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| - v8::HandleScope handle_scope(isolate);
|
| + v8::EscapableHandleScope handle_scope(isolate);
|
| v8::Local<v8::Object> console_object = v8::Object::New();
|
| BindLogMethod(isolate, console_object, "debug", &Debug);
|
| BindLogMethod(isolate, console_object, "log", &Log);
|
| BindLogMethod(isolate, console_object, "warn", &Warn);
|
| BindLogMethod(isolate, console_object, "error", &Error);
|
| - return handle_scope.Close(console_object);
|
| + return handle_scope.Escape(console_object);
|
| }
|
|
|
| } // namespace console
|
|
|