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

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

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

Powered by Google App Engine
This is Rietveld 408576698