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

Unified Diff: gpu/config/gpu_info.cc

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.h ('k') | gpu/config/gpu_info_collector_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_info.cc
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc
index 0b5c4870ea9836bcba047b7826f34bbfa347a245..4734a5b14846c1a8586dfcc289fe72c24b795856 100644
--- a/gpu/config/gpu_info.cc
+++ b/gpu/config/gpu_info.cc
@@ -60,7 +60,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
std::string driver_date;
std::string pixel_shader_version;
std::string vertex_shader_version;
- std::string machine_model;
+ std::string machine_model_name;
+ std::string machine_model_version;
std::string gl_version;
std::string gl_version_string;
std::string gl_vendor;
@@ -88,7 +89,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
Fields_Have_Changed_In_GPUInfo_So_Update_Below);
// Required fields (according to DevTools protocol) first.
- enumerator->AddString("machineModel", machine_model);
+ enumerator->AddString("machineModelName", machine_model_name);
+ enumerator->AddString("machineModelVersion", machine_model_version);
EnumerateGPUDevice(enumerator, gpu);
for (size_t ii = 0; ii < secondary_gpus.size(); ++ii) {
EnumerateGPUDevice(enumerator, secondary_gpus[ii]);
« no previous file with comments | « gpu/config/gpu_info.h ('k') | gpu/config/gpu_info_collector_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698