Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / aw_browser_main_parts.cc

diff --git a/src/android_webview/browser/aw_browser_main_parts.cc b/src/android_webview/browser/aw_browser_main_parts.cc
index 29e9003..c5b66fe 100644 (file)
--- a/src/android_webview/browser/aw_browser_main_parts.cc
+++ b/src/android_webview/browser/aw_browser_main_parts.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -19,6 +20,7 @@
 #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"
@@ -45,15 +47,48 @@ void AwBrowserMainParts::PreEarlyInitialization() {
 }
 
 int AwBrowserMainParts::PreCreateThreads() {
-  ui::ResourceBundle::InitSharedInstanceLocaleOnly(
-      l10n_util::GetDefaultLocale(), NULL);
-
-  base::FilePath pak_path;
-  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
+  int pak_fd = 0;
+  int64 pak_off = 0;
+  int64 pak_len = 0;
+
+  // TODO(primiano, mkosiba): GetApplicationLocale requires a ResourceBundle
+  // instance to be present to work correctly so we call this (knowing it will
+  // fail) just to create the ResourceBundle instance. We should refactor
+  // ResourceBundle/GetApplicationLocale to not require an instance to be
+  // initialized.
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      l10n_util::GetDefaultLocale(),
+      NULL,
+      ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
+  std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";
+  if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
+    VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off
+            << " len=" << pak_len;
+    ui::ResourceBundle::CleanupSharedInstance();
+    ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
+        base::File(pak_fd), base::MemoryMappedFile::Region(pak_off, pak_len));
+  } else {
+    LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. "
+                    "Bringing up WebView without any locale";
+  }
 
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_path.AppendASCII("webviewchromium.pak"),
-      ui::SCALE_FACTOR_NONE);
+  // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
+  // load from file, using PATH_SERVICE, otherwise.
+  if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) {
+    VLOG(0) << "Loading webviewchromium.pak from, fd:" << pak_fd
+            << " off:" << pak_off << " len:" << pak_len;
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
+        base::File(pak_fd),
+        base::MemoryMappedFile::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());