Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(702)

Unified Diff: sky/engine/core/script/dart_controller.cc

Issue 1185233002: Update Dart dependency and patch dart_controller to account for non-backwards compatible API update (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/dart/embedder/dart_controller.cc ('k') | sky/tools/packager/vm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/script/dart_controller.cc
diff --git a/sky/engine/core/script/dart_controller.cc b/sky/engine/core/script/dart_controller.cc
index 04b03c117f329dbea5da92a91cdc32868e24a421..80338ba8a09fae1cd1814509ad918776c44510c9 100644
--- a/sky/engine/core/script/dart_controller.cc
+++ b/sky/engine/core/script/dart_controller.cc
@@ -238,17 +238,15 @@ 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) {
-
if (IsServiceIsolateURL(script_uri)) {
CHECK(kDartIsolateSnapshotBuffer);
DartState* dart_state = new DartState();
- Dart_Isolate isolate = Dart_CreateIsolate(script_uri,
- "main",
- kDartIsolateSnapshotBuffer,
- nullptr,
- error);
+ Dart_Isolate isolate =
+ Dart_CreateIsolate(script_uri, "main", kDartIsolateSnapshotBuffer,
+ nullptr, nullptr, error);
CHECK(isolate) << error;
dart_state->SetIsolate(isolate);
CHECK(Dart_IsServiceIsolate(isolate));
@@ -277,8 +275,9 @@ static Dart_Isolate IsolateCreateCallback(const char* script_uri,
// Create & start the handle watcher isolate
CHECK(kDartIsolateSnapshotBuffer);
DartState* dart_state = new DartState();
- Dart_Isolate isolate = Dart_CreateIsolate("sky:handle_watcher", "",
- kDartIsolateSnapshotBuffer, dart_state, error);
+ Dart_Isolate isolate =
+ Dart_CreateIsolate("sky:handle_watcher", "", kDartIsolateSnapshotBuffer,
+ nullptr, dart_state, error);
CHECK(isolate) << error;
dart_state->SetIsolate(isolate);
@@ -324,7 +323,7 @@ void DartController::CreateIsolateFor(PassOwnPtr<DOMDartState> state) {
dom_dart_state_ = state;
Dart_Isolate isolate = Dart_CreateIsolate(
dom_dart_state_->url().string().utf8().data(), "main",
- kDartIsolateSnapshotBuffer,
+ kDartIsolateSnapshotBuffer, nullptr,
static_cast<DartState*>(dom_dart_state_.get()), &error);
Dart_SetMessageNotifyCallback(MessageNotifyCallback);
CHECK(isolate) << error;
« no previous file with comments | « mojo/dart/embedder/dart_controller.cc ('k') | sky/tools/packager/vm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698