[fuchsia] Set up the namespace in dart:zircon (flutter#4628)

beezit94 · Feb 2, 2018 · d5338ed · d5338ed
1 parent 750c7e4
commit d5338ed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/content_handler/runtime_holder.cc b/content_handler/runtime_holder.cc
@@ -398,6 +398,7 @@ void RuntimeHolder::DidCreateMainIsolate(Dart_Isolate isolate) {
   }
   InitDartIoInternal();
   InitFuchsia();
+  InitZircon();
   InitMozartInternal();
 }
 
@@ -434,6 +435,17 @@ void RuntimeHolder::InitFuchsia() {
   ConnectToService(parent_env_service_provider.get(), clipboard_.NewRequest());
 }
 
+void RuntimeHolder::InitZircon() {
+  Dart_Handle zircon_lib = Dart_LookupLibrary(ToDart("dart:zircon"));
+  DART_CHECK_VALID(zircon_lib);
+
+  Dart_Handle namespace_type =
+      Dart_GetType(zircon_lib, ToDart("_Namespace"), 0, nullptr);
+  DART_CHECK_VALID(namespace_type);
+  DART_CHECK_VALID(Dart_SetField(namespace_type, ToDart("_namespace"),
+                                 ToDart(reinterpret_cast<intptr_t>(namespc_))));
+}
+
 void RuntimeHolder::InitMozartInternal() {
   fidl::InterfaceHandle<mozart::ViewContainer> view_container;
   view_->GetContainer(view_container.NewRequest());

diff --git a/content_handler/runtime_holder.h b/content_handler/runtime_holder.h
@@ -99,6 +99,7 @@ class RuntimeHolder : public blink::RuntimeDelegate,
 
   void InitDartIoInternal();
   void InitFuchsia();
+  void InitZircon();
   void InitMozartInternal();
 
   void PostBeginFrame();

diff --git a/runtime/dart_vm_entry_points_fuchsia.txt b/runtime/dart_vm_entry_points_fuchsia.txt
@@ -4,6 +4,7 @@ dart:io,_EmbedderConfig,_mayExit
 dart:io,_Namespace,_setupNamespace
 dart:mozart.internal,::,_context
 dart:mozart.internal,::,_viewContainer
+dart:zircon,_Namespace,_namespace
 dart:zircon,GetSizeResult,GetSizeResult.
 dart:zircon,Handle,Handle._
 dart:zircon,HandlePairResult,HandlePairResult.