[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"
@@ skipping 25 matching lines @@
   base::MessageLoopForUI::current()->Start();
 }
 
 int AwBrowserMainParts::PreCreateThreads() {
   ui::ResourceBundle::InitSharedInstanceLocaleOnly(
       l10n_util::GetDefaultLocale(), NULL);
 
   base::FilePath pak_path;
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
 
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_path.AppendASCII("webviewchromium.pak"),
-      ui::SCALE_FACTOR_NONE);
+  int pak_fd = 0;
+  int64 pak_off = 0;
+  int64 pak_len = 0;
+  if (!AwAssets::OpenAsset(
+          "webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) {
+    LOG(FATAL) << "Cannot load webviewchromium.pak assets from the apk";
+  } else {
+    VLOG(0) << "Loading pak from FD: " << pak_fd << " OFF: " << pak_off
+            << " LEN: " << pak_len;
+  }
+
+  // ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(

[mkosiba (inactive), 2014/07/18 05:54:22]

forgot to remove?

[Primiano Tucci (use gerrit), 2014/07/18 19:01:04]

Oh, yeah.

+  //     pak_path.AppendASCII("webviewchromium.pak"),
+  //     ui::SCALE_FACTOR_NONE);
+
+  base::File::Region region(pak_off, pak_len);
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
+      base::File(pak_fd), region, 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