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

Side by Side Diff: sky/tools/packager/vm.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 unified diff | Download patch
« no previous file with comments | « sky/engine/core/script/dart_controller.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/tools/packager/vm.h" 5 #include "sky/tools/packager/vm.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "sky/tools/packager/loader.h" 8 #include "sky/tools/packager/loader.h"
9 #include "sky/tools/packager/logging.h" 9 #include "sky/tools/packager/logging.h"
10 10
11 namespace blink { 11 namespace blink {
12 extern const uint8_t* kDartVmIsolateSnapshotBuffer; 12 extern const uint8_t* kDartVmIsolateSnapshotBuffer;
13 extern const uint8_t* kDartIsolateSnapshotBuffer; 13 extern const uint8_t* kDartIsolateSnapshotBuffer;
14 } 14 }
15 15
16 void InitDartVM() { 16 void InitDartVM() {
17 int argc = 0; 17 int argc = 0;
18 const char** argv = nullptr; 18 const char** argv = nullptr;
19 19
20 CHECK(Dart_SetVMFlags(argc, argv)); 20 CHECK(Dart_SetVMFlags(argc, argv));
21 CHECK(Dart_Initialize(blink::kDartVmIsolateSnapshotBuffer, 21 CHECK(Dart_Initialize(blink::kDartVmIsolateSnapshotBuffer, nullptr, nullptr,
22 nullptr, // Isolate created callback. 22 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
23 nullptr, // Isolate interrupt callback. 23 nullptr));
24 nullptr, // Unhandled exception callback.
25 nullptr, // Isolate shutdown callback.
26 // File IO callbacks.
27 nullptr, nullptr, nullptr, nullptr, nullptr));
28 } 24 }
29 25
30 Dart_Isolate CreateDartIsolate() { 26 Dart_Isolate CreateDartIsolate() {
31 CHECK(blink::kDartIsolateSnapshotBuffer); 27 CHECK(blink::kDartIsolateSnapshotBuffer);
32 char* error = nullptr; 28 char* error = nullptr;
33 Dart_Isolate isolate = 29 Dart_Isolate isolate = Dart_CreateIsolate("http://example.com", "main",
34 Dart_CreateIsolate("http://example.com", "main", 30 blink::kDartIsolateSnapshotBuffer,
35 blink::kDartIsolateSnapshotBuffer, nullptr, &error); 31 nullptr, nullptr, &error);
36 32
37 CHECK(isolate) << error; 33 CHECK(isolate) << error;
38 CHECK(!LogIfError(Dart_SetLibraryTagHandler(HandleLibraryTag))); 34 CHECK(!LogIfError(Dart_SetLibraryTagHandler(HandleLibraryTag)));
39 LoadSkyInternals(); 35 LoadSkyInternals();
40 36
41 Dart_ExitIsolate(); 37 Dart_ExitIsolate();
42 return isolate; 38 return isolate;
43 } 39 }
OLDNEW
« no previous file with comments | « sky/engine/core/script/dart_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698