| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/app/content_main_runner.h" | 5 #include "content/public/app/content_main_runner.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 #include <string.h> | 9 #include <string.h> |
| 10 | 10 |
| (...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 725 gin::V8Initializer::LoadV8Snapshot(); | 725 gin::V8Initializer::LoadV8Snapshot(); |
| 726 } | 726 } |
| 727 if (v8_natives_fd != -1) { | 727 if (v8_natives_fd != -1) { |
| 728 auto v8_natives_region = g_fds->GetRegion(kV8NativesDataDescriptor); | 728 auto v8_natives_region = g_fds->GetRegion(kV8NativesDataDescriptor); |
| 729 gin::V8Initializer::LoadV8NativesFromFD( | 729 gin::V8Initializer::LoadV8NativesFromFD( |
| 730 v8_natives_fd, v8_natives_region.offset, v8_natives_region.size); | 730 v8_natives_fd, v8_natives_region.offset, v8_natives_region.size); |
| 731 } else { | 731 } else { |
| 732 gin::V8Initializer::LoadV8Natives(); | 732 gin::V8Initializer::LoadV8Natives(); |
| 733 } | 733 } |
| 734 #else | 734 #else |
| 735 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 735 gin::V8Initializer::LoadV8Snapshot(); | 736 gin::V8Initializer::LoadV8Snapshot(); |
| 736 gin::V8Initializer::LoadV8Natives(); | 737 gin::V8Initializer::LoadV8Natives(); |
| 738 #endif // !CHROME_MULTIPLE_DLL_BROWSER |
| 737 #endif // OS_POSIX && !OS_MACOSX | 739 #endif // OS_POSIX && !OS_MACOSX |
| 738 #endif // V8_USE_EXTERNAL_STARTUP_DATA | 740 #endif // V8_USE_EXTERNAL_STARTUP_DATA |
| 739 | 741 |
| 740 if (delegate_) | 742 if (delegate_) |
| 741 delegate_->PreSandboxStartup(); | 743 delegate_->PreSandboxStartup(); |
| 742 | 744 |
| 743 if (!process_type.empty()) | 745 if (!process_type.empty()) |
| 744 CommonSubprocessInit(process_type); | 746 CommonSubprocessInit(process_type); |
| 745 | 747 |
| 746 #if defined(OS_WIN) | 748 #if defined(OS_WIN) |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 853 | 855 |
| 854 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 856 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 855 }; | 857 }; |
| 856 | 858 |
| 857 // static | 859 // static |
| 858 ContentMainRunner* ContentMainRunner::Create() { | 860 ContentMainRunner* ContentMainRunner::Create() { |
| 859 return new ContentMainRunnerImpl(); | 861 return new ContentMainRunnerImpl(); |
| 860 } | 862 } |
| 861 | 863 |
| 862 } // namespace content | 864 } // namespace content |
| OLD | NEW |