OLD | NEW |
---|---|
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 "chrome/browser/gpu/chrome_gpu_util.h" | 5 #include "chrome/browser/gpu/chrome_gpu_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #if defined(OS_MACOSX) | 8 #if defined(OS_MACOSX) |
9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
10 #endif | 10 #endif |
(...skipping 28 matching lines...) Expand all Loading... | |
39 #if !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) | 39 #if !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) |
40 return false; | 40 return false; |
41 #endif | 41 #endif |
42 | 42 |
43 // Necessary for linux_chromeos build since it defines both OS_LINUX | 43 // Necessary for linux_chromeos build since it defines both OS_LINUX |
44 // and OS_CHROMEOS. | 44 // and OS_CHROMEOS. |
45 #if defined(OS_CHROMEOS) | 45 #if defined(OS_CHROMEOS) |
46 return false; | 46 return false; |
47 #endif | 47 #endif |
48 | 48 |
49 #if defined(OS_WIN) | |
50 // Don't run the trial on Windows XP. | |
51 if (base::win::GetVersion() < base::win::VERSION_VISTA) | |
52 return false; | |
53 #endif | |
gab
2013/10/16 15:12:09
This could perhaps have caused it if the blacklist
| |
54 | |
55 #if defined(OS_MACOSX) | 49 #if defined(OS_MACOSX) |
56 // Browser and content shell tests hang on 10.7 when the Apple software | 50 // Browser and content shell tests hang on 10.7 when the Apple software |
57 // renderer is used. These tests ignore the blacklist (which disables | 51 // renderer is used. These tests ignore the blacklist (which disables |
58 // compositing both on 10.7 and when the Apple software renderer is used) | 52 // compositing both on 10.7 and when the Apple software renderer is used) |
59 // by specifying the kSkipGpuDataLoading switch, so disable forced | 53 // by specifying the kSkipGpuDataLoading switch, so disable forced |
60 // compositing here based on the switch and OS version. | 54 // compositing here based on the switch and OS version. |
61 // http://crbug.com/230931 | 55 // http://crbug.com/230931 |
62 if (base::mac::IsOSLion() && | 56 if (base::mac::IsOSLion() && |
63 CommandLine::ForCurrentProcess()->HasSwitch( | 57 CommandLine::ForCurrentProcess()->HasSwitch( |
64 switches::kSkipGpuDataLoading)) { | 58 switches::kSkipGpuDataLoading)) { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
123 | 117 |
124 bool force_compositing = (trial->group() == force_compositing_group); | 118 bool force_compositing = (trial->group() == force_compositing_group); |
125 bool thread = (trial->group() == thread_group); | 119 bool thread = (trial->group() == thread_group); |
126 UMA_HISTOGRAM_BOOLEAN("GPU.InForceCompositingModeFieldTrial", | 120 UMA_HISTOGRAM_BOOLEAN("GPU.InForceCompositingModeFieldTrial", |
127 force_compositing); | 121 force_compositing); |
128 UMA_HISTOGRAM_BOOLEAN("GPU.InCompositorThreadFieldTrial", thread); | 122 UMA_HISTOGRAM_BOOLEAN("GPU.InCompositorThreadFieldTrial", thread); |
129 } | 123 } |
130 | 124 |
131 } // namespace gpu_util | 125 } // namespace gpu_util |
132 | 126 |
OLD | NEW |