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

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 1147213004: Store and load icudtl.dat directly from the apk rather than extracting on start-up (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@load-from-apk
Patch Set: formatting nit Created 5 years, 6 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: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 89f7b2231df55e6944cadf2fbd1804afd7e54e08..d688dc4340534623ed4844d06f103fed5b77efe7 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -243,7 +243,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
void GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
- content::FileDescriptorInfo* mappings) override;
+ content::FileDescriptorInfo* mappings
+#if defined(OS_ANDROID)
+ , std::map<int, base::MemoryMappedFile::Region>* regions
+#endif
+ ) override;
#endif
#if defined(OS_WIN)
const wchar_t* GetResourceDllName() override;
@@ -305,6 +309,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
base::ScopedFD v8_natives_fd_;
base::ScopedFD v8_snapshot_fd_;
#endif // OS_POSIX && !OS_MACOSX
+#if defined(OS_ANDROID)
+ base::ScopedFD icudtl_fd_;
+ base::MemoryMappedFile::Region icudtl_region_;
+#endif
// Vector of additional ChromeContentBrowserClientParts.
// Parts are deleted in the reverse order they are added.

Powered by Google App Engine
This is Rietveld 408576698