Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: gpu/config/gpu_info_collector_mac.mm

Issue 241793002: Fix machine_model behaviors in gpu blacklist. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/gpu_info_collector_android.cc ('k') | gpu/config/software_rendering_list_json.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_info_collector_mac.mm
diff --git a/gpu/config/gpu_info_collector_mac.mm b/gpu/config/gpu_info_collector_mac.mm
index ec6a31d49c2a5ff3709df7bab5ba1ccc460df6ff..8eff59a57138e9f22001cfc05d0a9d7168acef95 100644
--- a/gpu/config/gpu_info_collector_mac.mm
+++ b/gpu/config/gpu_info_collector_mac.mm
@@ -185,13 +185,12 @@ GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
DCHECK(gpu_info);
- std::string model_name;
int32 model_major = 0, model_minor = 0;
base::mac::ParseModelIdentifier(base::mac::GetModelIdentifier(),
- &model_name, &model_major, &model_minor);
- base::ReplaceChars(model_name, " ", "_", &gpu_info->machine_model);
- gpu_info->machine_model += " " + base::IntToString(model_major) +
- "." + base::IntToString(model_minor);
+ &gpu_info->machine_model_name,
+ &model_major, &model_minor);
+ gpu_info->machine_model_version =
+ base::IntToString(model_major) + "." + base::IntToString(model_minor);
bool result = CollectPCIVideoCardInfo(gpu_info);
return result ? kCollectInfoSuccess : kCollectInfoNonFatalFailure;
« no previous file with comments | « gpu/config/gpu_info_collector_android.cc ('k') | gpu/config/software_rendering_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698