OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "content/browser/gpu/gpu_data_manager_impl_private.h" | 9 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
10 #include "content/public/browser/gpu_data_manager_observer.h" | 10 #include "content/public/browser/gpu_data_manager_observer.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 "version": "0.1", | 151 "version": "0.1", |
152 "entries": [ | 152 "entries": [ |
153 { | 153 { |
154 "id": 1, | 154 "id": 1, |
155 "features": [ | 155 "features": [ |
156 "webgl" | 156 "webgl" |
157 ] | 157 ] |
158 }, | 158 }, |
159 { | 159 { |
160 "id": 2, | 160 "id": 2, |
161 "gl_renderer": ".*GeForce.*", | 161 "gl_renderer": { |
| 162 "op": "contains", |
| 163 "value": "GeForce" |
| 164 }, |
162 "features": [ | 165 "features": [ |
163 "accelerated_2d_canvas" | 166 "accelerated_2d_canvas" |
164 ] | 167 ] |
165 } | 168 } |
166 ] | 169 ] |
167 } | 170 } |
168 ); | 171 ); |
169 | 172 |
170 gpu::GPUInfo gpu_info; | 173 gpu::GPUInfo gpu_info; |
171 gpu_info.gpu.vendor_id = 0x10de; | 174 gpu_info.gpu.vendor_id = 0x10de; |
(...skipping 23 matching lines...) Expand all Loading... |
195 | 198 |
196 const std::string blacklist_json = LONG_STRING_CONST( | 199 const std::string blacklist_json = LONG_STRING_CONST( |
197 { | 200 { |
198 "name": "gpu blacklist", | 201 "name": "gpu blacklist", |
199 "version": "0.1", | 202 "version": "0.1", |
200 "entries": [ | 203 "entries": [ |
201 { | 204 { |
202 "id": 1, | 205 "id": 1, |
203 "exceptions": [ | 206 "exceptions": [ |
204 { | 207 { |
205 "gl_renderer": ".*GeForce.*" | 208 "gl_renderer": { |
| 209 "op": "contains", |
| 210 "value": "GeForce" |
| 211 } |
206 } | 212 } |
207 ], | 213 ], |
208 "features": [ | 214 "features": [ |
209 "webgl" | 215 "webgl" |
210 ] | 216 ] |
211 } | 217 } |
212 ] | 218 ] |
213 } | 219 } |
214 ); | 220 ); |
215 gpu::GPUInfo gpu_info; | 221 gpu::GPUInfo gpu_info; |
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
729 EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1)); | 735 EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1)); |
730 { | 736 { |
731 base::RunLoop run_loop; | 737 base::RunLoop run_loop; |
732 run_loop.RunUntilIdle(); | 738 run_loop.RunUntilIdle(); |
733 } | 739 } |
734 EXPECT_TRUE(observer.gpu_info_updated()); | 740 EXPECT_TRUE(observer.gpu_info_updated()); |
735 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); | 741 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
736 } | 742 } |
737 | 743 |
738 } // namespace content | 744 } // namespace content |
OLD | NEW |