From e027c6b8749d60e14e160afece307bc52db51b20 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Mon, 15 Jun 2015 15:11:31 -0700 Subject: [PATCH] Update Dart dependency and patch dart_controller to account for non-backwards compatible API update BUG= R=abarth@chromium.org Review URL: https://codereview.chromium.org/1183253002. --- engine/core/script/dart_controller.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/core/script/dart_controller.cc b/engine/core/script/dart_controller.cc index 04b03c117f3..18e5532ba06 100644 --- a/engine/core/script/dart_controller.cc +++ b/engine/core/script/dart_controller.cc @@ -238,6 +238,7 @@ static void EnsureHandleWatcherStarted() { static Dart_Isolate IsolateCreateCallback(const char* script_uri, const char* main, const char* package_root, + Dart_IsolateFlags* flags, void* callback_data, char** error) { @@ -248,6 +249,7 @@ static Dart_Isolate IsolateCreateCallback(const char* script_uri, "main", kDartIsolateSnapshotBuffer, nullptr, + nullptr, error); CHECK(isolate) << error; dart_state->SetIsolate(isolate); @@ -278,7 +280,7 @@ static Dart_Isolate IsolateCreateCallback(const char* script_uri, CHECK(kDartIsolateSnapshotBuffer); DartState* dart_state = new DartState(); Dart_Isolate isolate = Dart_CreateIsolate("sky:handle_watcher", "", - kDartIsolateSnapshotBuffer, dart_state, error); + kDartIsolateSnapshotBuffer, nullptr, dart_state, error); CHECK(isolate) << error; dart_state->SetIsolate(isolate); @@ -324,7 +326,7 @@ void DartController::CreateIsolateFor(PassOwnPtr state) { dom_dart_state_ = state; Dart_Isolate isolate = Dart_CreateIsolate( dom_dart_state_->url().string().utf8().data(), "main", - kDartIsolateSnapshotBuffer, + kDartIsolateSnapshotBuffer, nullptr, static_cast(dom_dart_state_.get()), &error); Dart_SetMessageNotifyCallback(MessageNotifyCallback); CHECK(isolate) << error;