[android_webview] Do not extract webviewchromium.pak

android_webview/browser/aw_browser_main_parts.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/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_result_codes.h"
+#include "android_webview/native/aw_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_utils.h"
 #include "gpu/command_buffer/service/mailbox_synchronizer.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace android_webview {
 
 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
 AwBrowserMainParts::~AwBrowserMainParts() {
 }
 
 void AwBrowserMainParts::PreEarlyInitialization() {
   net::NetworkChangeNotifier::SetFactory(
       new net::NetworkChangeNotifierFactoryAndroid());
 
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop. Also see MainMessageLoopRun.
   DCHECK(!main_message_loop_.get());
   main_message_loop_.reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 }
 
 int AwBrowserMainParts::PreCreateThreads() {
-  ui::ResourceBundle::InitSharedInstanceLocaleOnly(
-      l10n_util::GetDefaultLocale(), NULL);
+  int pak_fd = 0;
+  int64 pak_off = 0;
+  int64 pak_len = 0;
 
-  base::FilePath pak_path;
-  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
+  // Try to load the locale pak file directly from the apk, falling back to
+  // the default ResourceBundle behavior, which uses PATH_SERVICE to locate the
+  // files on the storage, in case of failure.
+  std::string locale_pak_file = l10n_util::GetApplicationLocale(l10n_util::GetDefaultLocale()) + ".pak";
+  if (AwAssets::OpenAsset(locale_pak_file, &pak_fd, &pak_off, &pak_len)) {
+    VLOG(0) << "Loading " << locale_pak_file << " from FD: " << pak_fd << " OFF: " << pak_off << " LEN: " << pak_len;

[mkosiba (inactive), 2014/07/21 14:20:58]

aren't these lines a bit tooo loooonnnggg?

[Primiano Tucci (use gerrit), 2014/07/21 17:20:02]

Yeah, that's why the patchset was entitled "WIP" ;-)

+    ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
+        base::File(pak_fd),
+        base::File::Region(pak_off, pak_len),
+        /*should_load_common_resources=*/false);

[mkosiba (inactive), 2014/07/21 14:20:58]

nit: I _think_  it should be like: /*should_load_common_resources*/ false

[Primiano Tucci (use gerrit), 2014/07/21 17:20:03]

A search in code search seems to suggest the contrary
(\/\*\w+\=\*\/ vs \/\*\w+\*\/)

+  } else {

[mkosiba (inactive), 2014/07/21 14:20:58]

does this make sense? If it's not there in the apk, the odds of us finding the
right file in the app's data dir are pretty slim. Maybe we should just crash
instead.

[benm (inactive), 2014/07/21 14:38:55]

Long term, yes we should remove this. But for now I think that we need the
fallback to /system for the WebView.

On 2014/07/21 14:20:58, mkosiba wrote:

[Primiano Tucci (use gerrit), 2014/07/21 17:20:02]

Quoting Torne's previous comment in this CL:
"Yeah, we will need this to fall back for now otherwise android_aosp will
definitely break."

+    LOG(WARNING) << "Cannot load " << locale_pak_file << " assets from the apk."
+                    " Falling back loading it using PATH_SERVICE.";
+    ui::ResourceBundle::InitSharedInstanceLocaleOnly(
+        l10n_util::GetDefaultLocale(), NULL);
+  }
 
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_path.AppendASCII("webviewchromium.pak"),
-      ui::SCALE_FACTOR_NONE);
+  // Same logic as above for the webviewchromium.pak.
+  if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) {
+    VLOG(0) << "Loading pak from FD: " << pak_fd << " OFF: " << pak_off
+            << " LEN: " << pak_len;
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
+        base::File(pak_fd), base::File::Region(pak_off, pak_len), ui::SCALE_FACTOR_NONE);
+  } else {
+    base::FilePath pak_path;
+    PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
+    LOG(WARNING) << "Cannot load webviewchromium.pak assets from the apk. "
+                    "Falling back loading it from " << pak_path.MaybeAsASCII();
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+        pak_path.AppendASCII("webviewchromium.pak"),
+        ui::SCALE_FACTOR_NONE);
+  }
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(
       base::android::AttachCurrentThread());
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void AwBrowserMainParts::PreMainMessageLoopRun() {
   // TODO(boliu): Can't support accelerated 2d canvas and WebGL with ubercomp
   // yet: crbug.com/352424.
   if (!gpu::gles2::MailboxSynchronizer::Initialize()) {
     CommandLine* cl = CommandLine::ForCurrentProcess();
     cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
     cl->AppendSwitch(switches::kDisableExperimentalWebGL);
   }
 
   browser_context_->PreMainMessageLoopRun();
   // This is needed for WebView Classic backwards compatibility
   // See crbug.com/298495
   content::SetMaxURLChars(20 * 1024 * 1024);
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview