[Merge M54] Propagate common resources to WebView child process

android_webview/lib/main/aw_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/lib/main/aw_main_delegate.h"
 
 #include <memory>
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/browser_view_renderer.h"
@@ skipping 142 matching lines @@
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
   int crash_signal_fd = -1;
   if (process_type == switches::kRendererProcess) {
     auto* global_descriptors = base::GlobalDescriptors::GetInstance();
     int pak_fd = global_descriptors->Get(kAndroidWebViewLocalePakDescriptor);
     base::MemoryMappedFile::Region pak_region =
         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);
   }
   if (process_type.empty()) {
     if (command_line.HasSwitch(switches::kSingleProcess)) {
       process_type = breakpad::kWebViewSingleProcessType;
     } else {
       process_type = breakpad::kBrowserProcessType;
     }
   }
@@ skipping 84 matching lines @@
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwMainDelegate::CreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
       web_contents);
 }
 #endif
 
 }  // namespace android_webview