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