| Index: android_webview/lib/main/aw_main_delegate.cc
|
| diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
|
| index f45591858285f225af2a88a869db69bc27b5d84c..89e7792113e8465f1258d441ca10719f75447ab8 100644
|
| --- a/android_webview/lib/main/aw_main_delegate.cc
|
| +++ b/android_webview/lib/main/aw_main_delegate.cc
|
| @@ -159,11 +159,18 @@ void AwMainDelegate::PreSandboxStartup() {
|
| global_descriptors->GetRegion(kAndroidWebViewLocalePakDescriptor);
|
| ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
|
| pak_region);
|
| - pak_fd = global_descriptors->Get(kAndroidWebViewMainPakDescriptor);
|
| - pak_region =
|
| - global_descriptors->GetRegion(kAndroidWebViewMainPakDescriptor);
|
| - ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
|
| - base::File(pak_fd), pak_region, ui::SCALE_FACTOR_NONE);
|
| +
|
| + std::pair<int, ui::ScaleFactor> extra_paks[] = {
|
| + {kAndroidWebViewMainPakDescriptor, ui::SCALE_FACTOR_NONE},
|
| + {kAndroidWebView100PercentPakDescriptor, ui::SCALE_FACTOR_100P}};
|
| +
|
| + for (const auto& pak_info : extra_paks) {
|
| + pak_fd = global_descriptors->Get(pak_info.first);
|
| + pak_region = global_descriptors->GetRegion(pak_info.first);
|
| + ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
|
| + base::File(pak_fd), pak_region, pak_info.second);
|
| + }
|
| +
|
| crash_signal_fd =
|
| global_descriptors->Get(kAndroidWebViewCrashSignalDescriptor);
|
| }
|
|
|