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/gl_string_manager.h" | 5 #include "chrome/browser/gpu/gpu_pref_manager.h" |
6 | 6 |
7 #include "base/prefs/pref_registry_simple.h" | 7 #include "base/prefs/pref_registry_simple.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
11 #include "content/public/browser/gpu_data_manager.h" | 11 #include "content/public/browser/gpu_data_manager.h" |
12 #include "gpu/config/gpu_info.h" | |
12 | 13 |
13 // static | 14 // static |
14 void GLStringManager::RegisterPrefs(PrefRegistrySimple* registry) { | 15 void GpuPrefManager::RegisterPrefs(PrefRegistrySimple* registry) { |
15 registry->RegisterStringPref(prefs::kGLVendorString, std::string()); | 16 registry->RegisterStringPref(prefs::kGLVendorString, std::string()); |
16 registry->RegisterStringPref(prefs::kGLRendererString, std::string()); | 17 registry->RegisterStringPref(prefs::kGLRendererString, std::string()); |
17 registry->RegisterStringPref(prefs::kGLVersionString, std::string()); | 18 registry->RegisterStringPref(prefs::kGLVersionString, std::string()); |
19 registry->RegisterBooleanPref(prefs::kGPUUseWarp, false); | |
18 } | 20 } |
19 | 21 |
20 GLStringManager::GLStringManager() { | 22 GpuPrefManager::GpuPrefManager() { |
Zhenyao Mo
2014/08/20 21:02:09
You need to initialize use_warp_ here.
luken
2014/08/27 20:43:46
Deprecated code.
| |
21 } | 23 } |
22 | 24 |
23 GLStringManager::~GLStringManager() { | 25 GpuPrefManager::~GpuPrefManager() { |
24 } | 26 } |
25 | 27 |
26 void GLStringManager::Initialize() { | 28 void GpuPrefManager::Initialize() { |
27 // On MacOSX or Windows, preliminary GPUInfo is enough. | 29 #if defined(OS_LINUX) || defined(OS_WIN) |
28 #if defined(OS_LINUX) | |
29 // We never remove this observer from GpuDataManager. | 30 // We never remove this observer from GpuDataManager. |
30 content::GpuDataManager::GetInstance()->AddObserver(this); | 31 content::GpuDataManager::GetInstance()->AddObserver(this); |
31 | 32 |
32 PrefService* local_state = g_browser_process->local_state(); | 33 PrefService* local_state = g_browser_process->local_state(); |
33 if (!local_state) | 34 if (!local_state) |
34 return; | 35 return; |
35 | 36 |
37 #if defined(OS_LINUX) | |
36 gl_vendor_ = local_state->GetString(prefs::kGLVendorString); | 38 gl_vendor_ = local_state->GetString(prefs::kGLVendorString); |
37 gl_renderer_ = local_state->GetString(prefs::kGLRendererString); | 39 gl_renderer_ = local_state->GetString(prefs::kGLRendererString); |
38 gl_version_ = local_state->GetString(prefs::kGLVersionString); | 40 gl_version_ = local_state->GetString(prefs::kGLVersionString); |
39 | |
40 if (!gl_vendor_.empty() || !gl_renderer_.empty() || !gl_version_.empty()) { | 41 if (!gl_vendor_.empty() || !gl_renderer_.empty() || !gl_version_.empty()) { |
41 content::GpuDataManager::GetInstance()->SetGLStrings( | 42 content::GpuDataManager::GetInstance()->SetGLStrings( |
42 gl_vendor_, gl_renderer_, gl_version_); | 43 gl_vendor_, gl_renderer_, gl_version_); |
43 } | 44 } |
45 #elif defined(OS_WIN) | |
46 use_warp_ = local_state->GetBoolean(prefs::kGPUUseWarp); | |
47 content::GpuDataManager::GetInstance()->SetShouldUseWarp(use_warp_); | |
44 #endif | 48 #endif |
49 | |
50 #endif // defined(OS_LINUX) || defined(OS_WIN) | |
45 } | 51 } |
46 | 52 |
47 void GLStringManager::OnGpuInfoUpdate() { | 53 void GpuPrefManager::OnGpuInfoUpdate() { |
48 std::string gl_vendor, gl_renderer, gl_version; | 54 std::string gl_vendor, gl_renderer, gl_version; |
49 content::GpuDataManager::GetInstance()->GetGLStrings( | 55 content::GpuDataManager::GetInstance()->GetGLStrings( |
50 &gl_vendor, &gl_renderer, &gl_version); | 56 &gl_vendor, &gl_renderer, &gl_version); |
51 | |
52 PrefService* local_state = g_browser_process->local_state(); | 57 PrefService* local_state = g_browser_process->local_state(); |
53 if (!local_state) | 58 if (!local_state) |
54 return; | 59 return; |
55 | 60 |
56 if (!gl_vendor.empty() && gl_vendor != gl_vendor_) { | 61 if (!gl_vendor.empty() && gl_vendor != gl_vendor_) { |
57 gl_vendor_ = gl_vendor; | 62 gl_vendor_ = gl_vendor; |
58 local_state->SetString(prefs::kGLVendorString, gl_vendor_); | 63 local_state->SetString(prefs::kGLVendorString, gl_vendor_); |
59 } | 64 } |
60 if (!gl_renderer.empty() && gl_renderer != gl_renderer_) { | 65 if (!gl_renderer.empty() && gl_renderer != gl_renderer_) { |
61 gl_renderer_ = gl_renderer; | 66 gl_renderer_ = gl_renderer; |
62 local_state->SetString(prefs::kGLRendererString, gl_renderer_); | 67 local_state->SetString(prefs::kGLRendererString, gl_renderer_); |
63 } | 68 } |
64 if (!gl_version.empty() && gl_version != gl_version_) { | 69 if (!gl_version.empty() && gl_version != gl_version_) { |
65 gl_version_ = gl_version; | 70 gl_version_ = gl_version; |
66 local_state->SetString(prefs::kGLVersionString, gl_version_); | 71 local_state->SetString(prefs::kGLVersionString, gl_version_); |
67 } | 72 } |
73 | |
74 // GpuDataManager::ShouldUseWarp() may reflect command-line settings as well | |
75 // as saved state, so we query the value of the GPUInfo field, as it should | |
76 // only reflect the desired persistent state of use_warp. | |
77 bool use_warp = content::GpuDataManager::GetInstance()->GetGPUInfo().use_warp; | |
78 if (use_warp != use_warp_) { | |
79 use_warp_ = use_warp; | |
80 local_state->SetBoolean(prefs::kGPUUseWarp, use_warp_); | |
sky
2014/08/20 22:37:03
Why do we need to cache this in prefs? Can't we lo
luken
2014/08/27 20:43:46
No longer cached. We now determine at startup time
| |
81 local_state->CommitPendingWrite(); | |
Zhenyao Mo
2014/08/20 21:02:09
Is CommitPendingWrite() necessary?
sky
2014/08/20 22:37:03
Also, do you really need to cache use_warp_? Can y
luken
2014/08/27 20:43:46
Deprecated code.
luken
2014/08/27 20:43:46
Deprecated code.
| |
82 } | |
68 } | 83 } |
69 | 84 |
OLD | NEW |