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

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

Issue 1252293002: Revert of Allow WebGL on Android if the GPU has it's own process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « content/common/gpu/gpu_messages.h ('k') | gpu/config/gpu_control_list.h » ('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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <dwmapi.h> 8 #include <dwmapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 watchdog_thread->StartWithOptions(options); 217 watchdog_thread->StartWithOptions(options);
218 } 218 }
219 219
220 // Initializes StatisticsRecorder which tracks UMA histograms. 220 // Initializes StatisticsRecorder which tracks UMA histograms.
221 base::StatisticsRecorder::Initialize(); 221 base::StatisticsRecorder::Initialize();
222 222
223 gpu::GPUInfo gpu_info; 223 gpu::GPUInfo gpu_info;
224 // Get vendor_id, device_id, driver_version from browser process through 224 // Get vendor_id, device_id, driver_version from browser process through
225 // commandline switches. 225 // commandline switches.
226 GetGpuInfoFromCommandLine(gpu_info, command_line); 226 GetGpuInfoFromCommandLine(gpu_info, command_line);
227 gpu_info.in_process_gpu = false;
228 227
229 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) 228 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
230 VaapiWrapper::PreSandboxInitialization(); 229 VaapiWrapper::PreSandboxInitialization();
231 #endif 230 #endif
232 231
233 // Warm up resources that don't need access to GPUInfo. 232 // Warm up resources that don't need access to GPUInfo.
234 if (WarmUpSandbox(command_line)) { 233 if (WarmUpSandbox(command_line)) {
235 #if defined(OS_LINUX) 234 #if defined(OS_LINUX)
236 bool initialized_sandbox = false; 235 bool initialized_sandbox = false;
237 bool initialized_gl_context = false; 236 bool initialized_gl_context = false;
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 return true; 547 return true;
549 } 548 }
550 549
551 return false; 550 return false;
552 } 551 }
553 #endif // defined(OS_WIN) 552 #endif // defined(OS_WIN)
554 553
555 } // namespace. 554 } // namespace.
556 555
557 } // namespace content 556 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | gpu/config/gpu_control_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698