← Back to branch summary

~osomon/oxide/context-menu

« back to all changes in this revision

Viewing changes to shared/renderer/oxide_script_message_request_impl_renderer.cc

  • Committer: Olivier Tilloy
  • Date: 2015-04-24 11:34:28 UTC
  • mfrom: (1031.1.24 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20150424113428-r221y8t5hv083t0n
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/renderer/oxide_script_message_request_impl_renderer.cc
51
51
    return;
52
52
  }
53
53
 
54
 
  v8::Handle<v8::Value> argv[] = {
 
54
  v8::Local<v8::Value> argv[] = {
55
55
    v8::JSON::Parse(v8::String::NewFromUtf8(isolate, args.c_str()))
56
56
  };
57
57
 
70
70
    return;
71
71
  }
72
72
 
73
 
  v8::Handle<v8::Value> argv[] = {
 
73
  v8::Local<v8::Value> argv[] = {
74
74
    v8::Integer::New(isolate, int(error)),
75
75
    v8::String::NewFromUtf8(isolate, msg.c_str())
76
76
  };
81
81
void ScriptMessageRequestImplRenderer::DispatchResponse(
82
82
    v8::Handle<v8::Function> function,
83
83
    int argc,
84
 
    v8::Handle<v8::Value> argv[]) {
 
84
    v8::Local<v8::Value> argv[]) {
85
85
  v8::TryCatch try_catch;
86
86
  {
87
87
    blink::WebScopedMicrotaskSuppression mts;