summaryrefslogtreecommitdiff
path: root/chromium/content/gpu/gpu_main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/gpu/gpu_main.cc')
-rw-r--r--chromium/content/gpu/gpu_main.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/content/gpu/gpu_main.cc b/chromium/content/gpu/gpu_main.cc
index a8c68d4d0d2..2a29e6e2e4b 100644
--- a/chromium/content/gpu/gpu_main.cc
+++ b/chromium/content/gpu/gpu_main.cc
@@ -85,6 +85,10 @@
#if defined(CYGPROFILE_INSTRUMENTATION)
const int kGpuTimeout = 30000;
+#elif defined(OS_WIN)
+// Use a slightly longer timeout on Windows due to prevalence of slow and
+// infected machines.
+const int kGpuTimeout = 15000;
#else
const int kGpuTimeout = 10000;
#endif