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

Side by Side Diff: content/app/content_main_runner.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to lastest crrev.com/1128113011 Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/native_pixmap_manager.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 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 if (service_port.is_valid()) { 676 if (service_port.is_valid()) {
681 ChildIOSurfaceManager::GetInstance()->set_service_port( 677 ChildIOSurfaceManager::GetInstance()->set_service_port(
682 service_port.release()); 678 service_port.release());
683 IOSurfaceManager::SetInstance(ChildIOSurfaceManager::GetInstance()); 679 IOSurfaceManager::SetInstance(ChildIOSurfaceManager::GetInstance());
684 } 680 }
685 } 681 }
686 #elif defined(OS_WIN) 682 #elif defined(OS_WIN)
687 SetupCRT(command_line); 683 SetupCRT(command_line);
688 #endif 684 #endif
689 685
690 #if defined(USE_OZONE)
691 if (!ui::NativePixmapManager::GetInstance() &&
692 process_type == switches::kRendererProcess) {
693 ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create());
694 }
695 #endif
696
697 #if defined(OS_POSIX) 686 #if defined(OS_POSIX)
698 if (!process_type.empty()) { 687 if (!process_type.empty()) {
699 // When you hit Ctrl-C in a terminal running the browser 688 // When you hit Ctrl-C in a terminal running the browser
700 // process, a SIGINT is delivered to the entire process group. 689 // process, a SIGINT is delivered to the entire process group.
701 // When debugging the browser process via gdb, gdb catches the 690 // When debugging the browser process via gdb, gdb catches the
702 // SIGINT for the browser process (and dumps you back to the gdb 691 // SIGINT for the browser process (and dumps you back to the gdb
703 // console) but doesn't for the child processes, killing them. 692 // console) but doesn't for the child processes, killing them.
704 // The fix is to have child processes ignore SIGINT; they'll die 693 // The fix is to have child processes ignore SIGINT; they'll die
705 // on their own when the browser process goes away. 694 // on their own when the browser process goes away.
706 // 695 //
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 868
880 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 869 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
881 }; 870 };
882 871
883 // static 872 // static
884 ContentMainRunner* ContentMainRunner::Create() { 873 ContentMainRunner* ContentMainRunner::Create() {
885 return new ContentMainRunnerImpl(); 874 return new ContentMainRunnerImpl();
886 } 875 }
887 876
888 } // namespace content 877 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698