OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mojo/public/bindings/js/waiting_callback.h" | 5 #include "mojo/public/bindings/js/waiting_callback.h" |
6 | 6 |
7 #include "gin/per_context_data.h" | 7 #include "gin/per_context_data.h" |
8 #include "gin/per_isolate_data.h" | 8 #include "gin/per_isolate_data.h" |
9 | 9 |
10 namespace mojo { | 10 namespace mojo { |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 | 55 |
56 if (!runner_) | 56 if (!runner_) |
57 return; | 57 return; |
58 | 58 |
59 gin::Runner::Scope scope(runner_.get()); | 59 gin::Runner::Scope scope(runner_.get()); |
60 v8::Isolate* isolate = runner_->isolate(); | 60 v8::Isolate* isolate = runner_->isolate(); |
61 | 61 |
62 v8::Handle<v8::Value> hidden_value = | 62 v8::Handle<v8::Value> hidden_value = |
63 GetWrapper(isolate)->GetHiddenValue(GetHiddenPropertyName(isolate)); | 63 GetWrapper(isolate)->GetHiddenValue(GetHiddenPropertyName(isolate)); |
64 v8::Handle<v8::Function> callback; | 64 v8::Handle<v8::Function> callback; |
65 CHECK(gin::ConvertFromV8(hidden_value, &callback)); | 65 CHECK(gin::ConvertFromV8(isolate, hidden_value, &callback)); |
66 | 66 |
67 v8::Handle<v8::Value> args[] = { gin::ConvertToV8(isolate, result) }; | 67 v8::Handle<v8::Value> args[] = { gin::ConvertToV8(isolate, result) }; |
68 runner_->Call(callback, runner_->global(), 1, args); | 68 runner_->Call(callback, runner_->global(), 1, args); |
69 } | 69 } |
70 | 70 |
71 } // namespace js | 71 } // namespace js |
72 } // namespace mojo | 72 } // namespace mojo |
OLD | NEW |