Skip to content

Commit e231e3b

Browse files
authored
Remove extra method in ComputePlatformResolvedLocale (flutter#22362)
1 parent e98408b commit e231e3b

File tree

6 files changed

+0
-48
lines changed

6 files changed

+0
-48
lines changed

shell/common/platform_view.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -210,25 +210,6 @@ class PlatformView {
210210
///
211211
virtual void OnPlatformViewMarkTextureFrameAvailable(
212212
int64_t texture_id) = 0;
213-
214-
//--------------------------------------------------------------------------
215-
/// @brief Directly invokes platform-specific APIs to compute the
216-
/// locale the platform would have natively resolved to.
217-
///
218-
/// @param[in] supported_locale_data The vector of strings that represents
219-
/// the locales supported by the app.
220-
/// Each locale consists of three
221-
/// strings: languageCode, countryCode,
222-
/// and scriptCode in that order.
223-
///
224-
/// @return A vector of 3 strings languageCode, countryCode, and
225-
/// scriptCode that represents the locale selected by the
226-
/// platform. Empty strings mean the value was unassigned. Empty
227-
/// vector represents a null locale.
228-
///
229-
virtual std::unique_ptr<std::vector<std::string>>
230-
ComputePlatformViewResolvedLocale(
231-
const std::vector<std::string>& supported_locale_data) = 0;
232213
};
233214

234215
//----------------------------------------------------------------------------

shell/common/shell.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,13 +1178,6 @@ void Shell::SetNeedsReportTimings(bool value) {
11781178
// |Engine::Delegate|
11791179
std::unique_ptr<std::vector<std::string>> Shell::ComputePlatformResolvedLocale(
11801180
const std::vector<std::string>& supported_locale_data) {
1181-
return ComputePlatformViewResolvedLocale(supported_locale_data);
1182-
}
1183-
1184-
// |PlatformView::Delegate|
1185-
std::unique_ptr<std::vector<std::string>>
1186-
Shell::ComputePlatformViewResolvedLocale(
1187-
const std::vector<std::string>& supported_locale_data) {
11881181
return platform_view_->ComputePlatformResolvedLocales(supported_locale_data);
11891182
}
11901183

shell/common/shell.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,10 +507,6 @@ class Shell final : public PlatformView::Delegate,
507507
// |PlatformView::Delegate|
508508
void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) override;
509509

510-
// |PlatformView::Delegate|
511-
std::unique_ptr<std::vector<std::string>> ComputePlatformViewResolvedLocale(
512-
const std::vector<std::string>& supported_locale_data) override;
513-
514510
// |Animator::Delegate|
515511
void OnAnimatorBeginFrame(fml::TimePoint frame_target_time) override;
516512

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ void OnPlatformViewSetAccessibilityFeatures(int32_t flags) override {}
3333
void OnPlatformViewRegisterTexture(std::shared_ptr<Texture> texture) override {}
3434
void OnPlatformViewUnregisterTexture(int64_t texture_id) override {}
3535
void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {}
36-
37-
std::unique_ptr<std::vector<std::string>> ComputePlatformViewResolvedLocale(
38-
const std::vector<std::string>& supported_locale_data) override {
39-
std::unique_ptr<std::vector<std::string>> out = std::make_unique<std::vector<std::string>>();
40-
return out;
41-
}
4236
};
4337

4438
} // namespace

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ void OnPlatformViewSetAccessibilityFeatures(int32_t flags) override {}
8989
void OnPlatformViewRegisterTexture(std::shared_ptr<Texture> texture) override {}
9090
void OnPlatformViewUnregisterTexture(int64_t texture_id) override {}
9191
void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {}
92-
93-
std::unique_ptr<std::vector<std::string>> ComputePlatformViewResolvedLocale(
94-
const std::vector<std::string>& supported_locale_data) override {
95-
std::unique_ptr<std::vector<std::string>> out = std::make_unique<std::vector<std::string>>();
96-
return out;
97-
}
9892
};
9993

10094
} // namespace

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ void OnPlatformViewSetAccessibilityFeatures(int32_t flags) override {}
8686
void OnPlatformViewRegisterTexture(std::shared_ptr<Texture> texture) override {}
8787
void OnPlatformViewUnregisterTexture(int64_t texture_id) override {}
8888
void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) override {}
89-
90-
std::unique_ptr<std::vector<std::string>> ComputePlatformViewResolvedLocale(
91-
const std::vector<std::string>& supported_locale_data) override {
92-
std::unique_ptr<std::vector<std::string>> out = std::make_unique<std::vector<std::string>>();
93-
return out;
94-
}
9589
};
9690

9791
class MockIosDelegate : public AccessibilityBridge::IosDelegate {

0 commit comments

Comments
 (0)