| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 6d212d2c7132c835078bbc4b34ee03a70a6fccd8..e43533aa60d901ca4e89af4bc1962b18e6c1173e 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -1474,7 +1474,7 @@ void RenderFrameImpl::OnJavaScriptExecuteRequest(
|
| TRACE_EVENT_SCOPE_THREAD);
|
|
|
| v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
|
| - v8::Handle<v8::Value> result =
|
| + v8::Local<v8::Value> result =
|
| frame_->executeScriptAndReturnValue(WebScriptSource(jscript));
|
|
|
| HandleJavascriptExecutionResult(jscript, id, notify_result, result);
|
| @@ -1491,7 +1491,7 @@ void RenderFrameImpl::OnJavaScriptExecuteRequestForTests(
|
| // can grant additional privileges (e.g. the ability to create popups).
|
| blink::WebScopedUserGesture gesture;
|
| v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
|
| - v8::Handle<v8::Value> result =
|
| + v8::Local<v8::Value> result =
|
| frame_->executeScriptAndReturnValue(WebScriptSource(jscript));
|
|
|
| HandleJavascriptExecutionResult(jscript, id, notify_result, result);
|
| @@ -1501,7 +1501,7 @@ void RenderFrameImpl::HandleJavascriptExecutionResult(
|
| const base::string16& jscript,
|
| int id,
|
| bool notify_result,
|
| - v8::Handle<v8::Value> result) {
|
| + v8::Local<v8::Value> result) {
|
| if (notify_result) {
|
| base::ListValue list;
|
| if (!result.IsEmpty()) {
|
| @@ -1659,7 +1659,7 @@ void RenderFrameImpl::OnPostMessageEvent(
|
| converter.SetDateAllowed(true);
|
| converter.SetRegExpAllowed(true);
|
| scoped_ptr<base::Value> value(new base::StringValue(params.data));
|
| - v8::Handle<v8::Value> result_value = converter.ToV8Value(value.get(),
|
| + v8::Local<v8::Value> result_value = converter.ToV8Value(value.get(),
|
| context);
|
| serialized_script_value = WebSerializedScriptValue::serialize(result_value);
|
| } else {
|
| @@ -3460,7 +3460,7 @@ void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) {
|
| }
|
|
|
| void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame,
|
| - v8::Handle<v8::Context> context,
|
| + v8::Local<v8::Context> context,
|
| int extension_group,
|
| int world_id) {
|
| DCHECK(!frame_ || frame_ == frame);
|
| @@ -3470,7 +3470,7 @@ void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame,
|
| }
|
|
|
| void RenderFrameImpl::willReleaseScriptContext(blink::WebLocalFrame* frame,
|
| - v8::Handle<v8::Context> context,
|
| + v8::Local<v8::Context> context,
|
| int world_id) {
|
| DCHECK(!frame_ || frame_ == frame);
|
|
|
|
|