Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 65ce657

Browse files
GaryQianGaryQian
committed
Additional renaming
1 parent a783bad commit 65ce657

18 files changed

+84
-77
lines changed

‎shell/common/engine.cc‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,15 +511,16 @@ const std::string& Engine::GetLastEntrypointLibrary() const {
511511
// feature. Left commented out until it lands:
512512

513513
// // |RuntimeDelegate|
514-
// void Engine::InstallDeferredLibrary(intptr_t loading_unit_id) {
515-
// return delegate_.InstallDeferredLibrary(loading_unit_id);
514+
// void Engine::RequestDartDeferredLibrary(intptr_t loading_unit_id) {
515+
// return delegate_.RequestDartDeferredLibrary(loading_unit_id);
516516
// }
517517

518-
void Engine::LoadDartDeferredLibrary(intptr_t loading_unit_id,
519-
const uint8_t* snapshot_data,
520-
const uint8_t* snapshot_instructions) {
518+
void Engine::CompleteDartDeferredLibraryLoading(
519+
intptr_t loading_unit_id,
520+
const uint8_t* snapshot_data,
521+
const uint8_t* snapshot_instructions) {
521522
if (runtime_controller_->IsRootIsolateRunning()) {
522-
// runtime_controller_->LoadDartDeferredLibrary(loading_unit_id,
523+
// runtime_controller_->CompleteDartDeferredLibraryLoading(loading_unit_id,
523524
// snapshot_data, snapshot_instructions);
524525
}
525526
}

‎shell/common/engine.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class Engine final : public RuntimeDelegate,
270270
/// @param[in] loading_unit_id The unique id of the deferred library's
271271
/// loading unit.
272272
///
273-
virtual void InstallDeferredLibrary(intptr_t loading_unit_id) = 0;
273+
virtual void RequestDartDeferredLibrary(intptr_t loading_unit_id) = 0;
274274
};
275275

276276
//----------------------------------------------------------------------------
@@ -795,9 +795,9 @@ class Engine final : public RuntimeDelegate,
795795
/// @param[in] snapshot_data Dart snapshot instructions of the loading
796796
/// unit's shared library.
797797
///
798-
void LoadDartDeferredLibrary(intptr_t loading_unit_id,
799-
const uint8_t* snapshot_data,
800-
const uint8_t* snapshot_instructions);
798+
void CompleteDartDeferredLibraryLoading(intptr_t loading_unit_id,
799+
const uint8_t* snapshot_data,
800+
const uint8_t* snapshot_instructions);
801801

802802
private:
803803
Engine::Delegate& delegate_;
@@ -851,7 +851,7 @@ class Engine final : public RuntimeDelegate,
851851
// feature. Left commented out until it lands:
852852

853853
// // |RuntimeDelegate|
854-
// void InstallDeferredLibrary(intptr_t loading_unit_id) override;
854+
// void RequestDartDeferredLibrary(intptr_t loading_unit_id) override;
855855

856856
void SetNeedsReportTimings(bool value) override;
857857

‎shell/common/engine_unittests.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MockDelegate : public Engine::Delegate {
3333
MOCK_METHOD1(ComputePlatformResolvedLocale,
3434
std::unique_ptr<std::vector<std::string>>(
3535
const std::vector<std::string>&));
36-
MOCK_METHOD1(InstallDeferredLibrary, void(intptr_t));
36+
MOCK_METHOD1(RequestDartDeferredLibrary, void(intptr_t));
3737
};
3838

3939
class MockResponse : public PlatformMessageResponse {
@@ -57,7 +57,7 @@ class MockRuntimeDelegate : public RuntimeDelegate {
5757
MOCK_METHOD1(ComputePlatformResolvedLocale,
5858
std::unique_ptr<std::vector<std::string>>(
5959
const std::vector<std::string>&));
60-
MOCK_METHOD1(InstallDeferredLibrary, void(intptr_t));
60+
MOCK_METHOD1(RequestDartDeferredLibrary, void(intptr_t));
6161
};
6262

6363
class MockRuntimeController : public RuntimeController {

‎shell/common/platform_view.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ PlatformView::ComputePlatformResolvedLocales(
152152
return out;
153153
}
154154

155-
void PlatformView::InstallDeferredLibrary(intptr_t loading_unit_id) {}
155+
void PlatformView::RequestDartDeferredLibrary(intptr_t loading_unit_id) {}
156156

157-
void PlatformView::LoadDartDeferredLibrary(
157+
void PlatformView::CompleteDartDeferredLibraryLoading(
158158
intptr_t loading_unit_id,
159159
const uint8_t* snapshot_data,
160160
const uint8_t* snapshot_instructions) {}

‎shell/common/platform_view.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class PlatformView {
256256
/// @param[in] snapshot_data Dart snapshot instructions of the loading
257257
/// unit's shared library.
258258
///
259-
virtual void LoadDartDeferredLibrary(
259+
virtual void CompleteDartDeferredLibraryLoading(
260260
intptr_t loading_unit_id,
261261
const uint8_t* snapshot_data,
262262
const uint8_t* snapshot_instructions) = 0;
@@ -629,7 +629,7 @@ class PlatformView {
629629
/// @param[in] loading_unit_id The unique id of the deferred library's
630630
/// loading unit.
631631
///
632-
virtual void InstallDeferredLibrary(intptr_t loading_unit_id);
632+
virtual void RequestDartDeferredLibrary(intptr_t loading_unit_id);
633633

634634
//--------------------------------------------------------------------------
635635
/// @brief Loads the dart shared library into the dart VM. When the
@@ -648,9 +648,10 @@ class PlatformView {
648648
/// @param[in] snapshot_data Dart snapshot instructions of the loading
649649
/// unit's shared library.
650650
///
651-
virtual void LoadDartDeferredLibrary(intptr_t loading_unit_id,
652-
const uint8_t* snapshot_data,
653-
const uint8_t* snapshot_instructions);
651+
virtual void CompleteDartDeferredLibraryLoading(
652+
intptr_t loading_unit_id,
653+
const uint8_t* snapshot_data,
654+
const uint8_t* snapshot_instructions);
654655

655656
//--------------------------------------------------------------------------
656657
/// @brief Sets the asset manager of the engine to asset_manager

‎shell/common/shell.cc‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,25 +1188,26 @@ Shell::ComputePlatformViewResolvedLocale(
11881188
return platform_view_->ComputePlatformResolvedLocales(supported_locale_data);
11891189
}
11901190

1191-
void Shell::LoadDartDeferredLibrary(intptr_t loading_unit_id,
1192-
const uint8_t* snapshot_data,
1193-
const uint8_t* snapshot_instructions) {
1194-
engine_->LoadDartDeferredLibrary(loading_unit_id, snapshot_data,
1195-
snapshot_instructions);
1191+
void Shell::CompleteDartDeferredLibraryLoading(
1192+
intptr_t loading_unit_id,
1193+
const uint8_t* snapshot_data,
1194+
const uint8_t* snapshot_instructions) {
1195+
engine_->CompleteDartDeferredLibraryLoading(loading_unit_id, snapshot_data,
1196+
snapshot_instructions);
11961197
}
11971198

11981199
void Shell::UpdateAssetManager(std::shared_ptr<AssetManager> asset_manager) {
11991200
engine_->UpdateAssetManager(std::move(asset_manager));
12001201
}
12011202

12021203
// |Engine::Delegate|
1203-
void Shell::InstallDeferredLibrary(intptr_t loading_unit_id) {
1204+
void Shell::RequestDartDeferredLibrary(intptr_t loading_unit_id) {
12041205
OnPlatformViewDartLoadLibrary(loading_unit_id);
12051206
}
12061207

12071208
// |PlatformView::Delegate|
12081209
void Shell::OnPlatformViewDartLoadLibrary(intptr_t loading_unit_id) {
1209-
platform_view_->InstallDeferredLibrary(loading_unit_id);
1210+
platform_view_->RequestDartDeferredLibrary(loading_unit_id);
12101211
}
12111212

12121213
void Shell::ReportTimings() {

‎shell/common/shell.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,10 @@ class Shell final : public PlatformView::Delegate,
516516
void OnPlatformViewDartLoadLibrary(intptr_t loading_unit_id) override;
517517

518518
// |PlatformView::Delegate|
519-
void LoadDartDeferredLibrary(intptr_t loading_unit_id,
520-
const uint8_t* snapshot_data,
521-
const uint8_t* snapshot_instructions) override;
519+
void CompleteDartDeferredLibraryLoading(
520+
intptr_t loading_unit_id,
521+
const uint8_t* snapshot_data,
522+
const uint8_t* snapshot_instructions) override;
522523

523524
// |PlatformView::Delegate|
524525
void UpdateAssetManager(std::shared_ptr<AssetManager> asset_manager) override;
@@ -565,7 +566,7 @@ class Shell final : public PlatformView::Delegate,
565566
const std::vector<std::string>& supported_locale_data) override;
566567

567568
// |Engine::Delegate|
568-
void InstallDeferredLibrary(intptr_t loading_unit_id) override;
569+
void RequestDartDeferredLibrary(intptr_t loading_unit_id) override;
569570

570571
// |Rasterizer::Delegate|
571572
void OnFrameRasterized(const FrameTiming&) override;

‎shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ public void setDynamicFeatureManager(@NonNull DynamicFeatureManager dynamicFeatu
954954
@SuppressWarnings("unused")
955955
@UiThread
956956
// public void downloadDynamicFeature(int loadingUnitId) {
957-
public void installDeferredLibrary(int loadingUnitId) {
957+
public void RequestDartDeferredLibrary(int loadingUnitId) {
958958
dynamicFeatureManager.downloadDynamicFeature(loadingUnitId);
959959
}
960960

@@ -969,18 +969,18 @@ public void installDeferredLibrary(int loadingUnitId) {
969969
* triggered the install/load process.
970970
*/
971971
@UiThread
972-
public void loadDartLibrary(
972+
public void loadDartDeferredLibrary(
973973
int loadingUnitId,
974974
@NonNull String libName,
975975
@NonNull String[] apkPaths,
976976
@NonNull String abi,
977977
@NonNull String soPath) {
978978
ensureRunningOnMainThread();
979979
ensureAttachedToNative();
980-
nativeLoadDartLibrary(nativePlatformViewId, loadingUnitId, libName, apkPaths, abi, soPath);
980+
nativeLoadDartDeferredLibrary(nativePlatformViewId, loadingUnitId, libName, apkPaths, abi, soPath);
981981
}
982982

983-
private native void nativeLoadDartLibrary(
983+
private native void nativeLoadDartDeferredLibrary(
984984
long nativePlatformViewId,
985985
int loadingUnitId,
986986
@NonNull String libName,

‎shell/platform/android/io/flutter/embedding/engine/dynamicfeatures/PlayStoreDynamicFeatureManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public void loadDartLibrary(int loadingUnitId) {
286286
}
287287
}
288288

289-
flutterJNI.loadDartLibrary(
289+
flutterJNI.loadDartDeferredLibrary(
290290
loadingUnitId,
291291
aotSharedLibraryName,
292292
apkPaths.toArray(new String[apkPaths.size()]),

‎shell/platform/android/jni/platform_view_android_jni.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class PlatformViewAndroidJNI {
196196

197197
virtual double GetDisplayRefreshRate() = 0;
198198

199-
virtual bool InstallDeferredLibrary(int loading_unit_id) = 0;
199+
virtual bool RequestDartDeferredLibrary(int loading_unit_id) = 0;
200200
};
201201

202202
} // namespace flutter

0 commit comments

Comments
 (0)