From 888709032013fbe274e88c9aeda57bedd9ca0331 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 15 Jun 2015 18:34:27 -0700 Subject: [PATCH] Update Dart dependency and patch dart_controller to account for non-backwards compatible API update Patch originally by chinmaygarde. R=chinmaygarde@google.com Review URL: https://codereview.chromium.org/1185233002. --- engine/src/flutter/tools/packager/vm.cc | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/engine/src/flutter/tools/packager/vm.cc b/engine/src/flutter/tools/packager/vm.cc index 7472198dff3..5e45eb8cb21 100644 --- a/engine/src/flutter/tools/packager/vm.cc +++ b/engine/src/flutter/tools/packager/vm.cc @@ -18,21 +18,17 @@ void InitDartVM() { const char** argv = nullptr; CHECK(Dart_SetVMFlags(argc, argv)); - CHECK(Dart_Initialize(blink::kDartVmIsolateSnapshotBuffer, - nullptr, // Isolate created callback. - nullptr, // Isolate interrupt callback. - nullptr, // Unhandled exception callback. - nullptr, // Isolate shutdown callback. - // File IO callbacks. - nullptr, nullptr, nullptr, nullptr, nullptr)); + CHECK(Dart_Initialize(blink::kDartVmIsolateSnapshotBuffer, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr)); } Dart_Isolate CreateDartIsolate() { CHECK(blink::kDartIsolateSnapshotBuffer); char* error = nullptr; - Dart_Isolate isolate = - Dart_CreateIsolate("http://example.com", "main", - blink::kDartIsolateSnapshotBuffer, nullptr, &error); + Dart_Isolate isolate = Dart_CreateIsolate("http://example.com", "main", + blink::kDartIsolateSnapshotBuffer, + nullptr, nullptr, &error); CHECK(isolate) << error; CHECK(!LogIfError(Dart_SetLibraryTagHandler(HandleLibraryTag)));