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

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

Issue 881763003: Roll Clang 223108:228742 (Closed) Base URL: precise:/work/chromium/src@clang_roll_226907
Patch Set: Re-upload Created 5 years, 10 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/zygote/zygote_main_linux.cc » ('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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "content/public/common/sandbox_init.h" 53 #include "content/public/common/sandbox_init.h"
54 #endif 54 #endif
55 55
56 #if defined(OS_MACOSX) 56 #if defined(OS_MACOSX)
57 #include "base/message_loop/message_pump_mac.h" 57 #include "base/message_loop/message_pump_mac.h"
58 #include "content/common/sandbox_mac.h" 58 #include "content/common/sandbox_mac.h"
59 #endif 59 #endif
60 60
61 #if defined(ADDRESS_SANITIZER) 61 #if defined(ADDRESS_SANITIZER)
62 #include <sanitizer/asan_interface.h> 62 #include <sanitizer/asan_interface.h>
63 #include <sanitizer/coverage_interface.h>
63 #endif 64 #endif
64 65
65 const int kGpuTimeout = 10000; 66 const int kGpuTimeout = 10000;
66 67
67 namespace content { 68 namespace content {
68 69
69 namespace { 70 namespace {
70 71
71 void GetGpuInfoFromCommandLine(gpu::GPUInfo& gpu_info, 72 void GetGpuInfoFromCommandLine(gpu::GPUInfo& gpu_info,
72 const base::CommandLine& command_line); 73 const base::CommandLine& command_line);
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 return true; 533 return true;
533 } 534 }
534 535
535 return false; 536 return false;
536 } 537 }
537 #endif // defined(OS_WIN) 538 #endif // defined(OS_WIN)
538 539
539 } // namespace. 540 } // namespace.
540 541
541 } // namespace content 542 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/zygote/zygote_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698