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

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

Issue 1325053009: cygprofile: increase timeouts to allow showing web contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/browser/renderer_host/compositor_impl_android.cc ('k') | 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 <dwmapi.h> 8 #include <dwmapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) 69 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
70 #include "content/common/gpu/media/vaapi_wrapper.h" 70 #include "content/common/gpu/media/vaapi_wrapper.h"
71 #endif 71 #endif
72 72
73 #if defined(SANITIZER_COVERAGE) 73 #if defined(SANITIZER_COVERAGE)
74 #include <sanitizer/common_interface_defs.h> 74 #include <sanitizer/common_interface_defs.h>
75 #include <sanitizer/coverage_interface.h> 75 #include <sanitizer/coverage_interface.h>
76 #endif 76 #endif
77 77
78 #if defined(CYGPROFILE_INSTRUMENTATION)
79 const int kGpuTimeout = 30000;
80 #else
78 const int kGpuTimeout = 10000; 81 const int kGpuTimeout = 10000;
82 #endif
79 83
80 namespace content { 84 namespace content {
81 85
82 namespace { 86 namespace {
83 87
84 void GetGpuInfoFromCommandLine(gpu::GPUInfo& gpu_info, 88 void GetGpuInfoFromCommandLine(gpu::GPUInfo& gpu_info,
85 const base::CommandLine& command_line); 89 const base::CommandLine& command_line);
86 bool WarmUpSandbox(const base::CommandLine& command_line); 90 bool WarmUpSandbox(const base::CommandLine& command_line);
87 91
88 #if !defined(OS_MACOSX) 92 #if !defined(OS_MACOSX)
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 return true; 548 return true;
545 } 549 }
546 550
547 return false; 551 return false;
548 } 552 }
549 #endif // defined(OS_WIN) 553 #endif // defined(OS_WIN)
550 554
551 } // namespace. 555 } // namespace.
552 556
553 } // namespace content 557 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/compositor_impl_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698