| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/gpu_data_manager.h" | 5 #include "content/browser/gpu/gpu_data_manager.h" |
| 6 | 6 |
| 7 #if defined(OS_MACOSX) | 7 #if defined(OS_MACOSX) |
| 8 #include <CoreGraphics/CGDisplayConfiguration.h> | 8 #include <CoreGraphics/CGDisplayConfiguration.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "base/stringprintf.h" | 13 #include "base/stringprintf.h" |
| 14 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
| 15 #include "base/sys_info.h" | 15 #include "base/sys_info.h" |
| 16 #include "base/values.h" | 16 #include "base/values.h" |
| 17 #include "base/version.h" | 17 #include "base/version.h" |
| 18 #include "content/browser/browser_thread.h" | 18 #include "content/browser/browser_thread.h" |
| 19 #include "content/browser/gpu/gpu_blacklist.h" | 19 #include "content/browser/gpu/gpu_blacklist.h" |
| 20 #include "content/browser/gpu/gpu_process_host.h" | 20 #include "content/browser/gpu/gpu_process_host.h" |
| 21 #include "content/common/content_client.h" | 21 #include "content/common/content_client.h" |
| 22 #include "content/common/content_switches.h" | |
| 23 #include "content/common/gpu/gpu_messages.h" | 22 #include "content/common/gpu/gpu_messages.h" |
| 24 #include "content/gpu/gpu_info_collector.h" | 23 #include "content/gpu/gpu_info_collector.h" |
| 24 #include "content/public/common/content_switches.h" |
| 25 #include "ui/gfx/gl/gl_implementation.h" | 25 #include "ui/gfx/gl/gl_implementation.h" |
| 26 #include "ui/gfx/gl/gl_switches.h" | 26 #include "ui/gfx/gl/gl_switches.h" |
| 27 #include "webkit/plugins/plugin_switches.h" | 27 #include "webkit/plugins/plugin_switches.h" |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 enum GpuFeatureStatus { | 31 enum GpuFeatureStatus { |
| 32 kGpuFeatureEnabled = 0, | 32 kGpuFeatureEnabled = 0, |
| 33 kGpuFeatureBlacklisted = 1, | 33 kGpuFeatureBlacklisted = 1, |
| 34 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted | 34 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 698 if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0) | 698 if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0) |
| 699 return NULL; | 699 return NULL; |
| 700 return gpu_blacklist_.get(); | 700 return gpu_blacklist_.get(); |
| 701 } | 701 } |
| 702 | 702 |
| 703 bool GpuDataManager::UseGLIsOSMesaOrAny() { | 703 bool GpuDataManager::UseGLIsOSMesaOrAny() { |
| 704 return (user_flags_.use_gl() == "any" || | 704 return (user_flags_.use_gl() == "any" || |
| 705 user_flags_.use_gl() == gfx::kGLImplementationOSMesaName); | 705 user_flags_.use_gl() == gfx::kGLImplementationOSMesaName); |
| 706 } | 706 } |
| 707 | 707 |
| OLD | NEW |