| 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 <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include "base/allocator/allocator_extension.h" | 9 #include "base/allocator/allocator_extension.h" |
| 10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #if !defined(OS_MACOSX) | 103 #if !defined(OS_MACOSX) |
| 104 #include "content/public/common/content_descriptors.h" | 104 #include "content/public/common/content_descriptors.h" |
| 105 #include "content/public/common/zygote_fork_delegate_linux.h" | 105 #include "content/public/common/zygote_fork_delegate_linux.h" |
| 106 #endif | 106 #endif |
| 107 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) | 107 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| 108 #include "content/zygote/zygote_main.h" | 108 #include "content/zygote/zygote_main.h" |
| 109 #endif | 109 #endif |
| 110 | 110 |
| 111 #endif // OS_POSIX | 111 #endif // OS_POSIX |
| 112 | 112 |
| 113 #if defined(USE_OZONE) | |
| 114 #include "ui/ozone/public/client_native_pixmap_factory.h" | |
| 115 #endif | |
| 116 | |
| 117 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC) | 113 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC) |
| 118 extern "C" { | 114 extern "C" { |
| 119 int tc_set_new_mode(int mode); | 115 int tc_set_new_mode(int mode); |
| 120 } | 116 } |
| 121 #endif | 117 #endif |
| 122 | 118 |
| 123 namespace content { | 119 namespace content { |
| 124 extern int GpuMain(const content::MainFunctionParams&); | 120 extern int GpuMain(const content::MainFunctionParams&); |
| 125 #if defined(ENABLE_PLUGINS) | 121 #if defined(ENABLE_PLUGINS) |
| 126 #if !defined(OS_LINUX) | 122 #if !defined(OS_LINUX) |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 663 if (service_port.is_valid()) { | 659 if (service_port.is_valid()) { |
| 664 ChildIOSurfaceManager::GetInstance()->set_service_port( | 660 ChildIOSurfaceManager::GetInstance()->set_service_port( |
| 665 service_port.release()); | 661 service_port.release()); |
| 666 IOSurfaceManager::SetInstance(ChildIOSurfaceManager::GetInstance()); | 662 IOSurfaceManager::SetInstance(ChildIOSurfaceManager::GetInstance()); |
| 667 } | 663 } |
| 668 } | 664 } |
| 669 #elif defined(OS_WIN) | 665 #elif defined(OS_WIN) |
| 670 SetupCRT(command_line); | 666 SetupCRT(command_line); |
| 671 #endif | 667 #endif |
| 672 | 668 |
| 673 #if defined(USE_OZONE) | |
| 674 if (process_type == switches::kRendererProcess) { | |
| 675 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); | |
| 676 ui::ClientNativePixmapFactory::SetInstance( | |
| 677 client_native_pixmap_factory_.get()); | |
| 678 } | |
| 679 #endif | |
| 680 | |
| 681 #if defined(OS_POSIX) | 669 #if defined(OS_POSIX) |
| 682 if (!process_type.empty()) { | 670 if (!process_type.empty()) { |
| 683 // When you hit Ctrl-C in a terminal running the browser | 671 // When you hit Ctrl-C in a terminal running the browser |
| 684 // process, a SIGINT is delivered to the entire process group. | 672 // process, a SIGINT is delivered to the entire process group. |
| 685 // When debugging the browser process via gdb, gdb catches the | 673 // When debugging the browser process via gdb, gdb catches the |
| 686 // SIGINT for the browser process (and dumps you back to the gdb | 674 // SIGINT for the browser process (and dumps you back to the gdb |
| 687 // console) but doesn't for the child processes, killing them. | 675 // console) but doesn't for the child processes, killing them. |
| 688 // The fix is to have child processes ignore SIGINT; they'll die | 676 // The fix is to have child processes ignore SIGINT; they'll die |
| 689 // on their own when the browser process goes away. | 677 // on their own when the browser process goes away. |
| 690 // | 678 // |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 | 839 |
| 852 // The delegate will outlive this object. | 840 // The delegate will outlive this object. |
| 853 ContentMainDelegate* delegate_; | 841 ContentMainDelegate* delegate_; |
| 854 | 842 |
| 855 scoped_ptr<base::AtExitManager> exit_manager_; | 843 scoped_ptr<base::AtExitManager> exit_manager_; |
| 856 #if defined(OS_WIN) | 844 #if defined(OS_WIN) |
| 857 sandbox::SandboxInterfaceInfo sandbox_info_; | 845 sandbox::SandboxInterfaceInfo sandbox_info_; |
| 858 #elif defined(OS_MACOSX) | 846 #elif defined(OS_MACOSX) |
| 859 scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_; | 847 scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_; |
| 860 #endif | 848 #endif |
| 861 #if defined(USE_OZONE) | |
| 862 scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; | |
| 863 #endif | |
| 864 | 849 |
| 865 base::Closure* ui_task_; | 850 base::Closure* ui_task_; |
| 866 | 851 |
| 867 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 852 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 868 }; | 853 }; |
| 869 | 854 |
| 870 // static | 855 // static |
| 871 ContentMainRunner* ContentMainRunner::Create() { | 856 ContentMainRunner* ContentMainRunner::Create() { |
| 872 return new ContentMainRunnerImpl(); | 857 return new ContentMainRunnerImpl(); |
| 873 } | 858 } |
| 874 | 859 |
| 875 } // namespace content | 860 } // namespace content |
| OLD | NEW |