| 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 | 303 |
| 304 const base::CommandLine& command_line = | 304 const base::CommandLine& command_line = |
| 305 *base::CommandLine::ForCurrentProcess(); | 305 *base::CommandLine::ForCurrentProcess(); |
| 306 | 306 |
| 307 if (command_line.HasSwitch(cc::switches::kDisableMainFrameBeforeActivation)) | 307 if (command_line.HasSwitch(cc::switches::kDisableMainFrameBeforeActivation)) |
| 308 return false; | 308 return false; |
| 309 | 309 |
| 310 if (command_line.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation)) | 310 if (command_line.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation)) |
| 311 return true; | 311 return true; |
| 312 | 312 |
| 313 return base::FeatureList::IsEnabled(features::kMainFrameBeforeActivation); | 313 return true; |
| 314 } | 314 } |
| 315 | 315 |
| 316 base::DictionaryValue* GetFeatureStatus() { | 316 base::DictionaryValue* GetFeatureStatus() { |
| 317 GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); | 317 GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); |
| 318 std::string gpu_access_blocked_reason; | 318 std::string gpu_access_blocked_reason; |
| 319 bool gpu_access_blocked = | 319 bool gpu_access_blocked = |
| 320 !manager->GpuAccessAllowed(&gpu_access_blocked_reason); | 320 !manager->GpuAccessAllowed(&gpu_access_blocked_reason); |
| 321 | 321 |
| 322 base::DictionaryValue* feature_status_dict = new base::DictionaryValue(); | 322 base::DictionaryValue* feature_status_dict = new base::DictionaryValue(); |
| 323 | 323 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 } | 408 } |
| 409 } | 409 } |
| 410 return problem_list; | 410 return problem_list; |
| 411 } | 411 } |
| 412 | 412 |
| 413 std::vector<std::string> GetDriverBugWorkarounds() { | 413 std::vector<std::string> GetDriverBugWorkarounds() { |
| 414 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); | 414 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace content | 417 } // namespace content |
| OLD | NEW |