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

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: 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
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 done pre-sandbox on all
103 // platforms. 103 // platforms.
104 (void) base::RandUint64(); 104 (void) base::RandUint64();
105 105
106 #if defined(OS_LINUX)
107 content::InitializeSandbox();
108 #endif
jln (very slow on Chromium) 2012/05/10 03:16:39 I would also leave that as is
Jorge Lucangeli Obes 2012/05/10 03:38:34 Done.
109
110 base::win::ScopedCOMInitializer com_initializer; 106 base::win::ScopedCOMInitializer com_initializer;
111 107
112 #if defined(OS_WIN) 108 #if defined(OS_WIN)
113 // Preload this DLL because the sandbox prevents it from loading. 109 // Preload this DLL because the sandbox prevents it from loading.
114 LoadLibrary(L"setupapi.dll"); 110 LoadLibrary(L"setupapi.dll");
115 111
116 sandbox::TargetServices* target_services = 112 sandbox::TargetServices* target_services =
117 parameters.sandbox_info->target_services; 113 parameters.sandbox_info->target_services;
118 // Initialize H/W video decoding stuff which fails in the sandbox. 114 // Initialize H/W video decoding stuff which fails in the sandbox.
119 DXVAVideoDecodeAccelerator::PreSandboxInitialization(); 115 DXVAVideoDecodeAccelerator::PreSandboxInitialization();
(...skipping 29 matching lines...) Expand all
149 child_thread->Init(start_time); 145 child_thread->Init(start_time);
150 146
151 gpu_process.set_main_thread(child_thread); 147 gpu_process.set_main_thread(child_thread);
152 148
153 main_message_loop.Run(); 149 main_message_loop.Run();
154 150
155 child_thread->StopWatchdog(); 151 child_thread->StopWatchdog();
156 152
157 return 0; 153 return 0;
158 } 154 }
OLDNEW
« content/common/sandbox_init_linux.cc ('K') | « content/common/sandbox_init_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698