Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 28a872ef78202b0087fa0a49be6249372d093734..993011121a012a049ba369ee6acc8d76004f88df 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -774,6 +774,8 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { |
| IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) |
| IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, |
| OnJavaScriptExecuteRequest) |
| + IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, |
| + OnJavaScriptExecuteRequestForTests) |
| IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, |
| OnSetEditableSelectionOffsets) |
| IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
| @@ -1230,7 +1232,30 @@ void RenderFrameImpl::OnJavaScriptExecuteRequest( |
| v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); |
| v8::Handle<v8::Value> result = |
| - frame_->executeScriptAndReturnValue(WebScriptSource(jscript)); |
| + frame_->executeScriptAndReturnValue(WebScriptSource(jscript)); |
| + |
| + HandleJavascriptExecutionResult(jscript, id, notify_result, result); |
| +} |
| + |
| +void RenderFrameImpl::OnJavaScriptExecuteRequestForTests( |
| + const base::string16& jscript, |
| + int id, |
| + bool notify_result) { |
| + TRACE_EVENT_INSTANT0("test_tracing", "OnJavaScriptExecuteRequestForTests", |
| + TRACE_EVENT_SCOPE_THREAD); |
|
jamesr
2014/09/03 20:22:11
not aligned
|
| + |
| + v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); |
| + v8::Handle<v8::Value> result = |
| + frame_->executeScriptAndReturnValueForTests(WebScriptSource(jscript)); |
| + |
| + HandleJavascriptExecutionResult(jscript, id, notify_result, result); |
| +} |
| + |
| +void RenderFrameImpl::HandleJavascriptExecutionResult( |
| + const base::string16& jscript, |
| + int id, |
| + bool notify_result, |
| + v8::Handle<v8::Value> result) { |
| if (notify_result) { |
| base::ListValue list; |
| if (!result.IsEmpty()) { |