Updates in flutter/runtime for the shell refactor (Patch 8).

runtime/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//third_party/dart/runtime/bin/vmservice/vmservice_sources.gni")
 import("$flutter_root/common/config.gni")
+import("$flutter_root/testing/testing.gni")
 
 action("gen_embedded_resources_cc") {
   script = "//third_party/dart/runtime/tools/create_resources.py"
@@ -37,9 +38,7 @@ source_set("embedded_resources_cc") {
   deps = [
     ":gen_embedded_resources_cc",
   ]
-  public_configs = [
-    "$flutter_root:config",
-  ]
+  public_configs = [ "$flutter_root:config" ]
 }
 
 source_set("test_font") {
@@ -50,9 +49,7 @@ source_set("test_font") {
   deps = [
     "//third_party/skia",
   ]
-  public_configs = [
-    "$flutter_root:config",
-  ]
+  public_configs = [ "$flutter_root:config" ]
   defines = []
   if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
     # Though the test font data is small, we dont want to add to the binary size
@@ -63,16 +60,19 @@ source_set("test_font") {
 }
 
 source_set("runtime") {
-
   sources = [
     "asset_font_selector.cc",
     "asset_font_selector.h",
-    "dart_controller.cc",
-    "dart_controller.h",
-    "dart_init.cc",
-    "dart_init.h",
+    "dart_isolate.cc",
+    "dart_isolate.h",
     "dart_service_isolate.cc",
     "dart_service_isolate.h",
+    "dart_snapshot.cc",
+    "dart_snapshot.h",
+    "dart_snapshot_buffer.cc",
+    "dart_snapshot_buffer.h",
+    "dart_vm.cc",
+    "dart_vm.h",
     "embedder_resources.cc",
     "embedder_resources.h",
     "platform_impl.cc",
@@ -81,8 +81,8 @@ source_set("runtime") {
     "runtime_controller.h",
     "runtime_delegate.cc",
     "runtime_delegate.h",
-    "runtime_init.cc",
-    "runtime_init.h",
+    "service_protocol.cc",
+    "service_protocol.h",
     "start_up.cc",
     "start_up.h",
     "test_font_selector.cc",
@@ -92,25 +92,24 @@ source_set("runtime") {
   deps = [
     ":embedded_resources_cc",
     ":test_font",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/dart/runtime/bin:embedded_dart_io",
     "$flutter_root/assets",
     "$flutter_root/common",
     "$flutter_root/flow",
+    "$flutter_root/fml",
     "$flutter_root/glue",
     "$flutter_root/lib/io",
     "$flutter_root/lib/ui",
     "$flutter_root/sky/engine/platform",
     "$flutter_root/third_party/txt",
     "//garnet/public/lib/fxl",
+    "//third_party/dart/runtime:dart_api",
+    "//third_party/dart/runtime/bin:embedded_dart_io",
     "//third_party/rapidjson",
     "//third_party/skia",
     "//topaz/lib/tonic",
   ]
 
-  public_configs = [
-    "$flutter_root:config",
-  ]
+  public_configs = [ "$flutter_root:config" ]
 
   # In AOT mode, precompiled snapshots contain the instruction buffer.
   # Generation of the same requires all application specific script code to be
@@ -119,3 +118,28 @@ source_set("runtime") {
     deps += [ "$flutter_root/lib/snapshot" ]
   }
 }
+
+test_fixtures("runtime_fixtures") {
+  fixtures = [ "fixtures/simple_main.dart" ]
+}
+
+executable("runtime_unittests") {
+  testonly = true
+
+  sources = [
+    "dart_isolate_unittests.cc",
+    "dart_vm_unittests.cc",
+  ]
+
+  deps = [
+    ":runtime",
+    ":runtime_fixtures",
+    "$flutter_root/fml",
+    "$flutter_root/lib/snapshot",
+    "$flutter_root/testing",
+    "//garnet/public/lib/fxl",
+    "//third_party/dart/runtime:libdart_jit",
+    "//third_party/skia",
+    "//topaz/lib/tonic",
+  ]
+}

runtime/asset_font_selector.cc

@@ -80,27 +80,15 @@ struct FontMatcher {
 
 }  // namespace
 
-void AssetFontSelector::Install(
-    fxl::RefPtr<AssetProvider> asset_provider) {
+void AssetFontSelector::Install(fxl::RefPtr<AssetManager> asset_manager) {
   RefPtr<AssetFontSelector> font_selector =
-      adoptRef(new AssetFontSelector(std::move(asset_provider)));
+      adoptRef(new AssetFontSelector(std::move(asset_manager)));
   font_selector->parseFontManifest();
   UIDartState::Current()->set_font_selector(font_selector);
 }
 
-void AssetFontSelector::Install(fxl::RefPtr<ZipAssetStore> asset_store) {
-  RefPtr<AssetFontSelector> font_selector =
-      adoptRef(new AssetFontSelector(std::move(asset_store)));
-  font_selector->parseFontManifest();
-  UIDartState::Current()->set_font_selector(font_selector);
-}
-
-AssetFontSelector::AssetFontSelector(
-    fxl::RefPtr<AssetProvider> asset_provider)
-    : asset_provider_(std::move(asset_provider)) {}
-
-AssetFontSelector::AssetFontSelector(fxl::RefPtr<ZipAssetStore> asset_store)
-    : asset_store_(std::move(asset_store)) {}
+AssetFontSelector::AssetFontSelector(fxl::RefPtr<AssetManager> asset_manager)
+    : asset_manager_(std::move(asset_manager)) {}
 
 AssetFontSelector::~AssetFontSelector() {}
 
@@ -118,12 +106,9 @@ AssetFontSelector::FlutterFontAttributes::~FlutterFontAttributes() {}
 
 void AssetFontSelector::parseFontManifest() {
   std::vector<uint8_t> font_manifest_data;
-  if (!asset_provider_ ||
-      !asset_provider_->GetAsBuffer(kFontManifestAssetPath,
-                                    &font_manifest_data)) {
-    if (!asset_store_ ||
-        !asset_store_->GetAsBuffer(kFontManifestAssetPath, &font_manifest_data))
-      return;
+  if (!asset_manager_->GetAsBuffer(kFontManifestAssetPath,
+                                   &font_manifest_data)) {
+    return;
   }
 
   rapidjson::Document document;
@@ -239,13 +224,8 @@ sk_sp<SkTypeface> AssetFontSelector::getTypefaceAsset(
   }
 
   std::unique_ptr<TypefaceAsset> typeface_asset(new TypefaceAsset);
-  if (!asset_provider_ || !asset_provider_->GetAsBuffer(
-                              asset_path, &typeface_asset->data)) {
-    if (!asset_store_ ||
-        !asset_store_->GetAsBuffer(asset_path, &typeface_asset->data)) {
-      typeface_cache_.insert(std::make_pair(asset_path, nullptr));
-      return nullptr;
-    }
+  if (!asset_manager_->GetAsBuffer(asset_path, &typeface_asset->data)) {
+    return nullptr;
   }
 
   sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());

runtime/asset_font_selector.h

@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "flutter/assets/directory_asset_bundle.h"
+#include "flutter/assets/asset_manager.h"
 #include "flutter/assets/zip_asset_store.h"
 #include "flutter/sky/engine/platform/fonts/FontCacheKey.h"
 #include "flutter/sky/engine/platform/fonts/FontSelector.h"
@@ -24,11 +24,7 @@ class AssetFontSelector : public FontSelector {
 
   ~AssetFontSelector() override;
 
-  static void Install(fxl::RefPtr<AssetProvider> asset_provider);
-
-  // TODO(zarah): Remove this and related code using asset_store once flx is
-  // removed.
-  static void Install(fxl::RefPtr<ZipAssetStore> asset_store);
+  static void Install(fxl::RefPtr<AssetManager> asset_manager);
 
   PassRefPtr<FontData> getFontData(const FontDescription& font_description,
                                    const AtomicString& family_name) override;
@@ -44,19 +40,14 @@ class AssetFontSelector : public FontSelector {
  private:
   struct TypefaceAsset;
 
-  explicit AssetFontSelector(
-      fxl::RefPtr<AssetProvider> asset_provider);
-
-  explicit AssetFontSelector(fxl::RefPtr<ZipAssetStore> asset_store);
+  explicit AssetFontSelector(fxl::RefPtr<AssetManager> asset_manager);
 
   void parseFontManifest();
 
   sk_sp<SkTypeface> getTypefaceAsset(const FontDescription& font_description,
                                      const AtomicString& family_name);
 
-  fxl::RefPtr<AssetProvider> asset_provider_;
-
-  fxl::RefPtr<ZipAssetStore> asset_store_;
+  fxl::RefPtr<AssetManager> asset_manager_;
 
   HashMap<AtomicString, std::vector<FlutterFontAttributes>> font_family_map_;