Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3000)

Unified Diff: content/shell/browser/shell_content_browser_client.h

Issue 1156873002: Load v8 snapshots directly from APK (and store them uncompressed) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8initializer
Patch Set: Pass FDs & Regions through to child process (Still has formatting errors) Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_content_browser_client.h
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h
index 0dc59b202254a2469bfb80410221ba271d6e20db..120b8cf5c17db43e4792b9d40cd06de491e157f6 100644
--- a/content/shell/browser/shell_content_browser_client.h
+++ b/content/shell/browser/shell_content_browser_client.h
@@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/content_browser_client.h"
#include "content/shell/browser/shell_speech_recognition_manager_delegate.h"
+#include "gin/v8_initializer.h"
namespace content {
@@ -75,7 +76,11 @@ class ShellContentBrowserClient : public ContentBrowserClient {
void GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
- FileDescriptorInfo* mappings) override;
+ content::FileDescriptorInfo* mappings
+#if defined(OS_ANDROID)
+ , std::map<int, base::MemoryMappedFile::Region>* regions
+#endif
+ ) override;
#endif
#if defined(OS_WIN)
void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override;
@@ -97,6 +102,9 @@ class ShellContentBrowserClient : public ContentBrowserClient {
}
private:
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ void LazyPrepV8StartupData();
+#endif
ShellBrowserContext* ShellBrowserContextForBrowserContext(
BrowserContext* content_browser_context);
@@ -104,8 +112,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
resource_dispatcher_host_delegate_;
#if defined(OS_POSIX) && !defined(OS_MACOSX)
- base::ScopedFD v8_natives_fd_;
- base::ScopedFD v8_snapshot_fd_;
+ gin::V8Initializer::V8Files v8_files_;
#endif
base::Closure select_client_certificate_callback_;

Powered by Google App Engine
This is Rietveld 408576698