| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/browser/shell_content_browser_client.h" | 5 #include "content/shell/browser/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file.h" | 9 #include "base/files/file.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 gfx::Size())->web_contents()); | 346 gfx::Size())->web_contents()); |
| 347 } | 347 } |
| 348 | 348 |
| 349 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 349 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 350 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 350 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| 351 const base::CommandLine& command_line, | 351 const base::CommandLine& command_line, |
| 352 int child_process_id, | 352 int child_process_id, |
| 353 FileDescriptorInfo* mappings) { | 353 FileDescriptorInfo* mappings) { |
| 354 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) | 354 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
| 355 if (v8_snapshot_fd_.get() == -1 && v8_natives_fd_.get() == -1) { | 355 if (v8_snapshot_fd_.get() == -1 && v8_natives_fd_.get() == -1) { |
| 356 base::FilePath v8_data_path; | 356 int v8_natives_fd = -1; |
| 357 PathService::Get(gin::IsolateHolder::kV8SnapshotBasePathKey, &v8_data_path); | 357 int v8_snapshot_fd = -1; |
| 358 DCHECK(!v8_data_path.empty()); | 358 if (gin::IsolateHolder::MapV8FilesForChildProcesses(&v8_natives_fd, |
| 359 | 359 &v8_snapshot_fd)) { |
| 360 int file_flags = base::File::FLAG_OPEN | base::File::FLAG_READ; | 360 v8_natives_fd_.reset(v8_natives_fd); |
| 361 base::FilePath v8_natives_data_path = | 361 v8_snapshot_fd_.reset(v8_snapshot_fd); |
| 362 v8_data_path.AppendASCII(gin::IsolateHolder::kNativesFileName); | 362 } |
| 363 base::FilePath v8_snapshot_data_path = | |
| 364 v8_data_path.AppendASCII(gin::IsolateHolder::kSnapshotFileName); | |
| 365 base::File v8_natives_data_file(v8_natives_data_path, file_flags); | |
| 366 base::File v8_snapshot_data_file(v8_snapshot_data_path, file_flags); | |
| 367 DCHECK(v8_natives_data_file.IsValid()); | |
| 368 DCHECK(v8_snapshot_data_file.IsValid()); | |
| 369 v8_natives_fd_.reset(v8_natives_data_file.TakePlatformFile()); | |
| 370 v8_snapshot_fd_.reset(v8_snapshot_data_file.TakePlatformFile()); | |
| 371 } | 363 } |
| 372 mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get()); | 364 mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get()); |
| 373 mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get()); | 365 mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get()); |
| 374 #endif // V8_USE_EXTERNAL_STARTUP_DATA | 366 #endif // V8_USE_EXTERNAL_STARTUP_DATA |
| 375 | 367 |
| 376 #if defined(OS_ANDROID) | 368 #if defined(OS_ANDROID) |
| 377 int flags = base::File::FLAG_OPEN | base::File::FLAG_READ; | 369 int flags = base::File::FLAG_OPEN | base::File::FLAG_READ; |
| 378 base::FilePath pak_file; | 370 base::FilePath pak_file; |
| 379 bool r = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file); | 371 bool r = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file); |
| 380 CHECK(r); | 372 CHECK(r); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 ShellBrowserContext* | 433 ShellBrowserContext* |
| 442 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( | 434 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( |
| 443 BrowserContext* content_browser_context) { | 435 BrowserContext* content_browser_context) { |
| 444 if (content_browser_context == browser_context()) | 436 if (content_browser_context == browser_context()) |
| 445 return browser_context(); | 437 return browser_context(); |
| 446 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); | 438 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); |
| 447 return off_the_record_browser_context(); | 439 return off_the_record_browser_context(); |
| 448 } | 440 } |
| 449 | 441 |
| 450 } // namespace content | 442 } // namespace content |
| OLD | NEW |