| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/bindings/dart_callback.h" | 6 #include "sky/engine/bindings/dart_callback.h" |
| 7 | 7 |
| 8 #include "sky/engine/tonic/dart_converter.h" | 8 #include "sky/engine/tonic/dart_converter.h" |
| 9 #include "sky/engine/tonic/dart_error.h" | 9 #include "sky/engine/tonic/dart_error.h" |
| 10 #include "sky/engine/tonic/dart_invoke.h" |
| 10 #include "sky/engine/tonic/dart_state.h" | 11 #include "sky/engine/tonic/dart_state.h" |
| 11 | 12 |
| 12 namespace blink { | 13 namespace blink { |
| 13 | 14 |
| 14 DartCallback::DartCallback(DartState* dart_state, | 15 DartCallback::DartCallback(DartState* dart_state, |
| 15 Dart_Handle callback, | 16 Dart_Handle callback, |
| 16 Dart_Handle& exception) | 17 Dart_Handle& exception) |
| 17 : callback_(dart_state, callback) { | 18 : callback_(dart_state, callback) { |
| 18 if (!Dart_IsClosure(callback)) { | 19 if (!Dart_IsClosure(callback)) { |
| 19 exception = ToDart("Callback must be a function"); | 20 exception = ToDart("Callback must be a function"); |
| 20 callback_.Clear(); | 21 callback_.Clear(); |
| 21 } | 22 } |
| 22 } | 23 } |
| 23 | 24 |
| 24 DartCallback::~DartCallback() { | 25 DartCallback::~DartCallback() { |
| 25 } | 26 } |
| 26 | 27 |
| 27 bool DartCallback::IsIsolateAlive() const { | 28 bool DartCallback::IsIsolateAlive() const { |
| 28 return !!callback_.dart_state(); | 29 return !!callback_.dart_state(); |
| 29 } | 30 } |
| 30 | 31 |
| 31 Dart_Isolate DartCallback::GetIsolate() const { | 32 Dart_Isolate DartCallback::GetIsolate() const { |
| 32 return callback_.dart_state()->isolate(); | 33 return callback_.dart_state()->isolate(); |
| 33 } | 34 } |
| 34 | 35 |
| 35 bool DartCallback::handleEvent(int argc, Dart_Handle* argv) { | 36 bool DartCallback::handleEvent(int argc, Dart_Handle* argv) { |
| 36 LogIfError(Dart_InvokeClosure(callback_.value(), argc, argv)); | 37 DartInvokeAppClosure(callback_.value(), argc, argv); |
| 37 return true; | 38 return true; |
| 38 } | 39 } |
| 39 | 40 |
| 40 } // namespace blink | 41 } // namespace blink |
| OLD | NEW |