firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1985 from chinmaygarde/master

Browse Source 
Dart isolate symbols are no longer in the blink namespace. Fix the snapshotter to account for the same.
This commit is contained in:
Chinmay Garde
2015-11-05 20:24:45 -08:00
parent cf90d0c297 5b679b84a8
commit 47b7ddf561
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/src/flutter/sky/tools/sky_snapshot/vm.cc
View File

@@ -8,9 +8,9 @@
#include "sky/tools/sky_snapshot/loader.h"
#include "sky/tools/sky_snapshot/logging.h"
namespace blink {
extern const uint8_t* kDartVmIsolateSnapshotBuffer;
extern const uint8_t* kDartIsolateSnapshotBuffer;
extern "C" {
extern void* kDartVmIsolateSnapshotBuffer;
extern void* kDartIsolateSnapshotBuffer;
}
static const char* kDartArgs[] = {
@@ -19,17 +19,19 @@ static const char* kDartArgs[] = {
void InitDartVM() {
CHECK(Dart_SetVMFlags(arraysize(kDartArgs), kDartArgs));
CHECK(Dart_Initialize(blink::kDartVmIsolateSnapshotBuffer, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr) == nullptr);
CHECK(
Dart_Initialize(reinterpret_cast<uint8_t*>(&kDartVmIsolateSnapshotBuffer),
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr) == nullptr);
}
Dart_Isolate CreateDartIsolate() {
CHECK(blink::kDartIsolateSnapshotBuffer);
CHECK(kDartIsolateSnapshotBuffer);
char* error = nullptr;
Dart_Isolate isolate = Dart_CreateIsolate("dart:snapshot", "main",
blink::kDartIsolateSnapshotBuffer,
nullptr, nullptr, &error);
Dart_Isolate isolate = Dart_CreateIsolate(
"dart:snapshot", "main",
reinterpret_cast<uint8_t*>(&kDartIsolateSnapshotBuffer), nullptr, nullptr,
&error);
CHECK(isolate) << error;
CHECK(!LogIfError(Dart_SetLibraryTagHandler(HandleLibraryTag)));