Rename to LoadDartDeferredLibrary

Author: GaryQian

shell/common/engine.cc

@@ -515,11 +515,11 @@ const std::string& Engine::GetLastEntrypointLibrary() const {
 //   return delegate_.InstallDeferredLibrary(loading_unit_id);
 // }
 
-void Engine::CompleteDartLoadLibrary(intptr_t loading_unit_id,
+void Engine::LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                      const uint8_t* snapshot_data,
                                      const uint8_t* snapshot_instructions) {
   if (runtime_controller_->IsRootIsolateRunning()) {
-    // runtime_controller_->CompleteDartLoadLibrary(loading_unit_id,
+    // runtime_controller_->LoadDartDeferredLibrary(loading_unit_id,
     //    snapshot_data, snapshot_instructions);
   }
 }

shell/common/engine.h

@@ -795,7 +795,7 @@ class Engine final : public RuntimeDelegate,
   /// @param[in]  snapshot_data    Dart snapshot instructions of the loading
   ///                              unit's shared library.
   ///
-  void CompleteDartLoadLibrary(intptr_t loading_unit_id,
+  void LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                const uint8_t* snapshot_data,
                                const uint8_t* snapshot_instructions);
 

shell/common/platform_view.cc

@@ -154,7 +154,7 @@ PlatformView::ComputePlatformResolvedLocales(
 
 void PlatformView::InstallDeferredLibrary(intptr_t loading_unit_id) {}
 
-void PlatformView::CompleteDartLoadLibrary(
+void PlatformView::LoadDartDeferredLibrary(
     intptr_t loading_unit_id,
     const uint8_t* snapshot_data,
     const uint8_t* snapshot_instructions) {}

shell/common/platform_view.h

@@ -256,7 +256,7 @@ class PlatformView {
     /// @param[in]  snapshot_data    Dart snapshot instructions of the loading
     ///                              unit's shared library.
     ///
-    virtual void CompleteDartLoadLibrary(
+    virtual void LoadDartDeferredLibrary(
         intptr_t loading_unit_id,
         const uint8_t* snapshot_data,
         const uint8_t* snapshot_instructions) = 0;
@@ -648,7 +648,7 @@ class PlatformView {
   /// @param[in]  snapshot_data    Dart snapshot instructions of the loading
   ///                              unit's shared library.
   ///
-  virtual void CompleteDartLoadLibrary(intptr_t loading_unit_id,
+  virtual void LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                        const uint8_t* snapshot_data,
                                        const uint8_t* snapshot_instructions);
 

shell/common/shell.cc

@@ -1188,10 +1188,10 @@ Shell::ComputePlatformViewResolvedLocale(
   return platform_view_->ComputePlatformResolvedLocales(supported_locale_data);
 }
 
-void Shell::CompleteDartLoadLibrary(intptr_t loading_unit_id,
+void Shell::LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                     const uint8_t* snapshot_data,
                                     const uint8_t* snapshot_instructions) {
-  engine_->CompleteDartLoadLibrary(loading_unit_id, snapshot_data,
+  engine_->LoadDartDeferredLibrary(loading_unit_id, snapshot_data,
                                    snapshot_instructions);
 }
 

shell/common/shell.h

@@ -516,7 +516,7 @@ class Shell final : public PlatformView::Delegate,
   void OnPlatformViewDartLoadLibrary(intptr_t loading_unit_id) override;
 
   // |PlatformView::Delegate|
-  void CompleteDartLoadLibrary(intptr_t loading_unit_id,
+  void LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                const uint8_t* snapshot_data,
                                const uint8_t* snapshot_instructions) override;
 

shell/platform/android/platform_view_android.cc

@@ -347,15 +347,15 @@ void PlatformViewAndroid::InstallDeferredLibrary(intptr_t loading_unit_id) {
   if (jni_facade_->InstallDeferredLibrary(loading_unit_id)) {
     return;
   }
-  return;  // TODO(garyq): Call CompleteDartLoadLibraryFailure()
+  return;  // TODO(garyq): Call LoadDartDeferredLibraryFailure()
 }
 
 // |PlatformView|
-void PlatformViewAndroid::CompleteDartLoadLibrary(
+void PlatformViewAndroid::LoadDartDeferredLibrary(
     intptr_t loading_unit_id,
     const uint8_t* snapshot_data,
     const uint8_t* snapshot_instructions) {
-  delegate_.CompleteDartLoadLibrary(loading_unit_id, snapshot_data,
+  delegate_.LoadDartDeferredLibrary(loading_unit_id, snapshot_data,
                                     snapshot_instructions);
 }
 

shell/platform/android/platform_view_android.h

@@ -97,7 +97,7 @@ class PlatformViewAndroid final : public PlatformView {
       const fml::jni::JavaObjectWeakGlobalRef& surface_texture);
 
   // |PlatformView|
-  void CompleteDartLoadLibrary(intptr_t loading_unit_id,
+  void LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                const uint8_t* snapshot_data,
                                const uint8_t* snapshot_instructions) override;
 

shell/platform/android/platform_view_android_jni_impl.cc

@@ -606,7 +606,7 @@ static void LoadDartLibrary(JNIEnv* env,
     }
   }
 
-  ANDROID_SHELL_HOLDER->GetPlatformView()->CompleteDartLoadLibrary(
+  ANDROID_SHELL_HOLDER->GetPlatformView()->LoadDartDeferredLibrary(
       loading_unit_id, isolate_data, isolate_instructions);
 
   // TODO(garyq): fallback on soPath.

shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm

@@ -43,7 +43,7 @@ void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {}
   Dart_Handle OnPlatformViewDartLoadLibrary(intptr_t loading_unit_id) override {
     return Dart_Null();
   }
-  void CompleteDartLoadLibrary(intptr_t loading_unit_id,
+  void LoadDartDeferredLibrary(intptr_t loading_unit_id,
                                std::string lib_name,
                                const std::vector<std::string>& apkPaths,
                                std::string abi) override {}