| 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 "content/browser/gpu/compositor_util.h" | 5 #include "content/browser/gpu/compositor_util.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 | 288 |
| 289 const base::CommandLine& command_line = | 289 const base::CommandLine& command_line = |
| 290 *base::CommandLine::ForCurrentProcess(); | 290 *base::CommandLine::ForCurrentProcess(); |
| 291 | 291 |
| 292 if (command_line.HasSwitch(cc::switches::kDisableMainFrameBeforeActivation)) | 292 if (command_line.HasSwitch(cc::switches::kDisableMainFrameBeforeActivation)) |
| 293 return false; | 293 return false; |
| 294 | 294 |
| 295 if (command_line.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation)) | 295 if (command_line.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation)) |
| 296 return true; | 296 return true; |
| 297 | 297 |
| 298 return true; | 298 return base::FeatureList::IsEnabled(features::kMainFrameBeforeActivation); |
| 299 } | 299 } |
| 300 | 300 |
| 301 base::DictionaryValue* GetFeatureStatus() { | 301 base::DictionaryValue* GetFeatureStatus() { |
| 302 GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); | 302 GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); |
| 303 std::string gpu_access_blocked_reason; | 303 std::string gpu_access_blocked_reason; |
| 304 bool gpu_access_blocked = | 304 bool gpu_access_blocked = |
| 305 !manager->GpuAccessAllowed(&gpu_access_blocked_reason); | 305 !manager->GpuAccessAllowed(&gpu_access_blocked_reason); |
| 306 | 306 |
| 307 base::DictionaryValue* feature_status_dict = new base::DictionaryValue(); | 307 base::DictionaryValue* feature_status_dict = new base::DictionaryValue(); |
| 308 | 308 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 } | 393 } |
| 394 } | 394 } |
| 395 return problem_list; | 395 return problem_list; |
| 396 } | 396 } |
| 397 | 397 |
| 398 std::vector<std::string> GetDriverBugWorkarounds() { | 398 std::vector<std::string> GetDriverBugWorkarounds() { |
| 399 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); | 399 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); |
| 400 } | 400 } |
| 401 | 401 |
| 402 } // namespace content | 402 } // namespace content |
| OLD | NEW |