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

Side by Side Diff: content/gpu/gpu_main.cc

Issue 10388063: Disable Chrome OS seccomp filter GPU sandbox. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move #ifdef to call site. Created 8 years, 7 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 | no next file » | 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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #endif 92 #endif
93 93
94 // Set the GPU info even if it failed. 94 // Set the GPU info even if it failed.
95 content::GetContentClient()->SetGpuInfo(gpu_info); 95 content::GetContentClient()->SetGpuInfo(gpu_info);
96 } else { 96 } else {
97 LOG(INFO) << "gfx::GLSurface::InitializeOneOff failed"; 97 LOG(INFO) << "gfx::GLSurface::InitializeOneOff failed";
98 gpu_info.gpu_accessible = false; 98 gpu_info.gpu_accessible = false;
99 dead_on_arrival = true; 99 dead_on_arrival = true;
100 } 100 }
101 101
102 // Warm up the random subsystem, which needs to done pre-sandbox on all 102 // Warm up the random subsystem, which needs to be done pre-sandbox on all
103 // platforms. 103 // platforms.
104 (void) base::RandUint64(); 104 (void) base::RandUint64();
105 105
106 #if defined(OS_LINUX) 106 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
107 content::InitializeSandbox(); 107 content::InitializeSandbox();
108 #endif 108 #endif
109 109
110 base::win::ScopedCOMInitializer com_initializer; 110 base::win::ScopedCOMInitializer com_initializer;
111 111
112 #if defined(OS_WIN) 112 #if defined(OS_WIN)
113 // Preload this DLL because the sandbox prevents it from loading. 113 // Preload this DLL because the sandbox prevents it from loading.
114 LoadLibrary(L"setupapi.dll"); 114 LoadLibrary(L"setupapi.dll");
115 115
116 sandbox::TargetServices* target_services = 116 sandbox::TargetServices* target_services =
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 child_thread->Init(start_time); 149 child_thread->Init(start_time);
150 150
151 gpu_process.set_main_thread(child_thread); 151 gpu_process.set_main_thread(child_thread);
152 152
153 main_message_loop.Run(); 153 main_message_loop.Run();
154 154
155 child_thread->StopWatchdog(); 155 child_thread->StopWatchdog();
156 156
157 return 0; 157 return 0;
158 } 158 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698