From 5b679b84a88d0259db844ce75930c9abd5e10081 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Thu, 5 Nov 2015 20:01:22 -0800
Subject: [PATCH] Dart isolate symbols are no longer in the blink namespace.
 Fix the snapshotter to account for the same.

---
 .../src/flutter/sky/tools/sky_snapshot/vm.cc  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/engine/src/flutter/sky/tools/sky_snapshot/vm.cc b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc
index 3f2febd3b6..bd06bc41d1 100644
--- a/engine/src/flutter/sky/tools/sky_snapshot/vm.cc
+++ b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc
@@ -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)));