From b0d50e486064530f0a342ce7fb58abd15aa88e23 Mon Sep 17 00:00:00 2001
From: John McCutchan <john@johnmccutchan.com>
Date: Mon, 11 Jul 2016 10:47:26 -0700
Subject: [PATCH] Fix service isolate startup (#2788)

---
 sky/engine/core/script/dart_init.cc            | 6 +++++-
 sky/engine/core/script/dart_service_isolate.cc | 5 +++++
 sky/engine/core/script/dart_service_isolate.h  | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sky/engine/core/script/dart_init.cc b/sky/engine/core/script/dart_init.cc
index b7cfec845..ba3756279 100644
--- a/sky/engine/core/script/dart_init.cc
+++ b/sky/engine/core/script/dart_init.cc
@@ -171,8 +171,12 @@ Dart_Isolate ServiceIsolateCreateCallback(const char* script_uri,
     if (settings.enable_observatory) {
       std::string ip = "127.0.0.1";
       const intptr_t port = settings.observatory_port;
+      const bool disable_websocket_origin_check = false;
       const bool service_isolate_booted = DartServiceIsolate::Startup(
-          ip, port, DartLibraryTagHandler, IsRunningPrecompiledCode(), error);
+          ip, port, DartLibraryTagHandler,
+          IsRunningPrecompiledCode(),
+          disable_websocket_origin_check,
+          error);
       CHECK(service_isolate_booted) << error;
     }
 
diff --git a/sky/engine/core/script/dart_service_isolate.cc b/sky/engine/core/script/dart_service_isolate.cc
index f5f0203cd..fabe92ca1 100644
--- a/sky/engine/core/script/dart_service_isolate.cc
+++ b/sky/engine/core/script/dart_service_isolate.cc
@@ -82,6 +82,7 @@ bool DartServiceIsolate::Startup(std::string server_ip,
                                  intptr_t server_port,
                                  Dart_LibraryTagHandler embedder_tag_handler,
                                  bool running_precompiled,
+                                 bool disable_origin_check,
                                  char** error) {
   Dart_Isolate isolate = Dart_CurrentIsolate();
   CHECK(isolate);
@@ -167,6 +168,10 @@ bool DartServiceIsolate::Startup(std::string server_ip,
                          Dart_NewStringFromCString("_autoStart"),
                          Dart_NewBoolean(auto_start));
   SHUTDOWN_ON_ERROR(result);
+  result = Dart_SetField(library,
+                         Dart_NewStringFromCString("_originCheckDisabled"),
+                         Dart_NewBoolean(disable_origin_check));
+  SHUTDOWN_ON_ERROR(result);
   return true;
 }
 
diff --git a/sky/engine/core/script/dart_service_isolate.h b/sky/engine/core/script/dart_service_isolate.h
index 9f91ab566..1db983cae 100644
--- a/sky/engine/core/script/dart_service_isolate.h
+++ b/sky/engine/core/script/dart_service_isolate.h
@@ -19,6 +19,7 @@ class DartServiceIsolate {
                       intptr_t server_port,
                       Dart_LibraryTagHandler embedder_tag_handler,
                       bool running_precompiled,
+                      bool disable_origin_check,
                       char** error);
 
   static int GetObservatoryPort();
-- 
GitLab