Additional cleanup and docs

GaryQian · GaryQian · commit b297499e5e6c · 2020-10-24T00:11:04.000-07:00
Build on host
diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc
@@ -292,13 +292,6 @@ std::string DartIsolate::GetServiceId() {
   return service_id;
 }
 
-// Dart_Handle DartDeferredLoadHandler(intptr_t loading_unit_id) {
-//   FML_LOG(ERROR) << "LOAD REQUEST CALLED FOR ID: " << loading_unit_id;
-//   // Temporary call for prototyping.
-//   return
-//   Engine::GetEngineDelegateTemp()->OnDartLoadLibrary(loading_unit_id);
-// }
-
 bool DartIsolate::Initialize(Dart_Isolate dart_isolate,
                              Dart_DeferredLoadHandler& deferred_load_handler) {
   TRACE_EVENT0("flutter", "DartIsolate::Initialize");
@@ -709,8 +702,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
 
   if (!vm_data) {
     *error = fml::strdup(
-        "Could not access VM data to initialize isolates. This may be "
-        "because "
+        "Could not access VM data to initialize isolates. This may be because "
         "the VM has initialized shutdown on another thread already.");
     return nullptr;
   }
@@ -728,8 +720,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
 
 #if (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG)
   // TODO(68663): The service isolate in debug mode is always launched without
-  // sound null safety. Fix after the isolate snapshot data is created with
-  // the right flags.
+  // sound null safety. Fix after the isolate snapshot data is created with the
+  // right flags.
   flags->null_safety =
       vm_data->GetIsolateSnapshot()->IsNullSafetyEnabled(nullptr);
 #endif
diff --git a/runtime/dart_isolate_unittests.cc b/runtime/dart_isolate_unittests.cc
@@ -353,18 +353,19 @@ TEST_F(DartIsolateTest, CanCreateServiceIsolate) {
   auto isolate_configuration =
       IsolateConfiguration::InferFromSettings(settings);
   auto weak_isolate = DartIsolate::CreateRunningRootIsolate(
-      vm_data->GetSettings(),              // settings
-      vm_data->GetIsolateSnapshot(),       // isolate snapshot
-      std::move(task_runners),             // task runners
-      nullptr,                             // window
-      {},                                  // snapshot delegate
-      {},                                  // hint freed delegate
-      {},                                  // io manager
-      {},                                  // unref queue
-      {},                                  // image decoder
-      "main.dart",                         // advisory uri
-      "main",                              // advisory entrypoint,
-      DartIsolate::Flags{},                // flags
+      vm_data->GetSettings(),         // settings
+      vm_data->GetIsolateSnapshot(),  // isolate snapshot
+      std::move(task_runners),        // task runners
+      nullptr,                        // window
+      {},                             // snapshot delegate
+      {},                             // hint freed delegate
+      {},                             // io manager
+      {},                             // unref queue
+      {},                             // image decoder
+      "main.dart",                    // advisory uri
+      "main",                         // advisory entrypoint,
+      DartIsolate::Flags{},           // flags
+      DartDeferredLoadHandler::empty_dart_deferred_load_handler,
       settings.isolate_create_callback,    // isolate create callback
       settings.isolate_shutdown_callback,  // isolate shutdown callback
       "main",                              // dart entrypoint
diff --git a/runtime/dart_lifecycle_unittests.cc b/runtime/dart_lifecycle_unittests.cc
@@ -52,43 +52,25 @@ static std::shared_ptr<DartIsolate> CreateAndRunRootIsolate(
   FML_CHECK(entrypoint.size() > 0);
   TaskRunners runners("io.flutter.test", task_runner, task_runner, task_runner,
                       task_runner);
-  auto isolate_weak = DartIsolate::CreateRootIsolate(
-      vm.GetSettings(),         // settings
-      vm.GetIsolateSnapshot(),  // isolate_snapshot
-      runners,                  // task_runners
-      {},                       // window
-      {},                       // snapshot_delegate
-      {},                       // hint_freed_delegate
-      {},                       // io_manager
-      {},                       // unref_queue
-      {},                       // image_decoder
-      "main.dart",              // advisory_script_uri
-      entrypoint.c_str(),       // advisory_script_entrypoint
-      nullptr,                  // flags
-      DartDeferredLoadHandler::empty_dart_deferred_load_handler,
-      settings.isolate_create_callback,   // isolate create callback
-      settings.isolate_shutdown_callback  // isolate shutdown callback
-  );
-
-  auto isolate = isolate_weak.lock();
 
   auto isolate_configuration =
       IsolateConfiguration::InferFromSettings(settings);
 
   auto isolate =
       DartIsolate::CreateRunningRootIsolate(
-          vm.GetSettings(),                    // settings
-          vm.GetIsolateSnapshot(),             // isolate_snapshot
-          runners,                             // task_runners
-          {},                                  // window
-          {},                                  // snapshot_delegate
-          {},                                  // hint_freed_delegate
-          {},                                  // io_manager
-          {},                                  // unref_queue
-          {},                                  // image_decoder
-          "main.dart",                         // advisory_script_uri
-          entrypoint.c_str(),                  // advisory_script_entrypoint
-          DartIsolate::Flags{},                // flags
+          vm.GetSettings(),         // settings
+          vm.GetIsolateSnapshot(),  // isolate_snapshot
+          runners,                  // task_runners
+          {},                       // window
+          {},                       // snapshot_delegate
+          {},                       // hint_freed_delegate
+          {},                       // io_manager
+          {},                       // unref_queue
+          {},                       // image_decoder
+          "main.dart",              // advisory_script_uri
+          entrypoint.c_str(),       // advisory_script_entrypoint
+          DartIsolate::Flags{},     // flags
+          DartDeferredLoadHandler::empty_dart_deferred_load_handler,
           settings.isolate_create_callback,    // isolate create callback
           settings.isolate_shutdown_callback,  // isolate shutdown callback,
           entrypoint,                          // dart entrypoint
diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
@@ -461,8 +461,6 @@ void RuntimeController::CompleteDartLoadLibrary(
     for (std::string paths : searchPaths) {
       FML_LOG(ERROR) << "    " << paths;
     }
-    // FML_LOG(ERROR) << "Opening lib \"" << lib_name
-    //                << "\" failed: " + std::string(::dlerror());
     return;
   }
 
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
@@ -277,7 +277,6 @@ public FlutterEngine(
       assetManager = context.getAssets();
     }
     this.dartExecutor = new DartExecutor(flutterJNI, assetManager);
-
     this.dartExecutor.onAttachedToJNI();
 
     accessibilityChannel = new AccessibilityChannel(dartExecutor, flutterJNI);
@@ -294,7 +293,6 @@ public FlutterEngine(
 
     this.localizationPlugin = new LocalizationPlugin(context, localizationChannel);
 
-
     this.flutterJNI = flutterJNI;
     dynamicFeatureManager = new PlayStoreDynamicFeatureManager(context, flutterJNI);
     if (flutterLoader == null) {
diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java
@@ -11,7 +11,6 @@
 import android.os.Bundle;
 import android.security.NetworkSecurityPolicy;
 import androidx.annotation.NonNull;
-import io.flutter.Log;
 import java.io.IOException;
 import org.json.JSONArray;
 import org.xmlpull.v1.XmlPullParserException;
@@ -143,6 +142,7 @@ public static FlutterApplicationInfo load(@NonNull Context applicationContext) {
     if (android.os.Build.VERSION.SDK_INT >= 23) {
       clearTextPermitted = NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted();
     }
+
     return new FlutterApplicationInfo(
         getString(appInfo.metaData, PUBLIC_AOT_SHARED_LIBRARY_NAME),
         getString(appInfo.metaData, PUBLIC_VM_SNAPSHOT_DATA_KEY),
diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
@@ -143,7 +143,7 @@ public void run() {
             if (resourceExtractor != null) {
               resourceExtractor.waitForCompletion();
             }
-            Log.e("flutter", "PATHS: " + PathUtils.getFilesDir(appContext) + "|" + PathUtils.getCacheDirectory(appContext) + "|" + PathUtils.getDataDirectory(appContext));
+
             return new InitResult(
                 PathUtils.getFilesDir(appContext),
                 PathUtils.getCacheDirectory(appContext),
diff --git a/testing/dart_isolate_runner.cc b/testing/dart_isolate_runner.cc
@@ -71,31 +71,6 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolateOnUITaskRunner(
   }
 
   auto settings = p_settings;
-  auto weak_isolate = DartIsolate::CreateRootIsolate(
-      vm_data->GetSettings(),         // settings
-      vm_data->GetIsolateSnapshot(),  // isolate snapshot
-      std::move(task_runners),        // task runners
-      nullptr,                        // window
-      {},                             // snapshot delegate
-      {},                             // hint freed delegate
-      io_manager,                     // io manager
-      {},                             // unref queue
-      {},                             // image decoder
-      "main.dart",                    // advisory uri
-      "main",                         // advisory entrypoint
-      nullptr,                        // flags
-      DartDeferredLoadHandler::empty_dart_deferred_load_handler,
-      settings.isolate_create_callback,   // isolate create callback
-      settings.isolate_shutdown_callback  // isolate shutdown callback
-  );
-
-  auto root_isolate = std::make_unique<AutoIsolateShutdown>(
-      weak_isolate.lock(), task_runners.GetUITaskRunner());
-
-  if (!root_isolate->IsValid()) {
-    FML_LOG(ERROR) << "Could not create isolate.";
-    return;
-  }
 
   settings.dart_entrypoint_args = args;
 
@@ -136,18 +111,19 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolateOnUITaskRunner(
 
   auto isolate =
       DartIsolate::CreateRunningRootIsolate(
-          settings,                            // settings
-          vm_data->GetIsolateSnapshot(),       // isolate snapshot
-          std::move(task_runners),             // task runners
-          nullptr,                             // window
-          {},                                  // snapshot delegate
-          {},                                  // hint freed delegate
-          io_manager,                          // io manager
-          {},                                  // unref queue
-          {},                                  // image decoder
-          "main.dart",                         // advisory uri
-          entrypoint.c_str(),                  // advisory entrypoint
-          DartIsolate::Flags{},                // flags
+          settings,                       // settings
+          vm_data->GetIsolateSnapshot(),  // isolate snapshot
+          std::move(task_runners),        // task runners
+          nullptr,                        // window
+          {},                             // snapshot delegate
+          {},                             // hint freed delegate
+          io_manager,                     // io manager
+          {},                             // unref queue
+          {},                             // image decoder
+          "main.dart",                    // advisory uri
+          entrypoint.c_str(),             // advisory entrypoint
+          DartIsolate::Flags{},           // flags
+          DartDeferredLoadHandler::empty_dart_deferred_load_handler,
           settings.isolate_create_callback,    // isolate create callback
           settings.isolate_shutdown_callback,  // isolate shutdown callback
           entrypoint,                          // entrypoint

Original file line number	Diff line number	Diff line change
`@@ -461,8 +461,6 @@ void RuntimeController::CompleteDartLoadLibrary(`
`461`	`461`	`for (std::string paths : searchPaths) {`
`462`	`462`	`FML_LOG(ERROR) << " " << paths;`
`463`	`463`	`}`
`464`		`- // FML_LOG(ERROR) << "Opening lib \"" << lib_name`
`465`		`- // << "\" failed: " + std::string(::dlerror());`
`466`	`464`	`return;`
`467`	`465`	`}`
`468`	`466`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public void run() {`
`143`	`143`	`if (resourceExtractor != null) {`
`144`	`144`	`resourceExtractor.waitForCompletion();`
`145`	`145`	`}`
`146`		`- Log.e("flutter", "PATHS: " + PathUtils.getFilesDir(appContext) + "\|" + PathUtils.getCacheDirectory(appContext) + "\|" + PathUtils.getDataDirectory(appContext));`
	`146`	`+`
`147`	`147`	`return new InitResult(`
`148`	`148`	`PathUtils.getFilesDir(appContext),`
`149`	`149`	`PathUtils.getCacheDirectory(appContext),`