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

Unified Diff: content/browser/gpu/gpu_internals_ui.cc

Issue 2187533002: skia_commit_hash.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2016-07-29 (Friday) 14:04:15 EDT Created 4 years, 5 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 | « DEPS ('k') | skia/ext/.gitignore » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_internals_ui.cc
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index 731c4abbae577796310bb49f28ff2124de4daf83..0f9f5a416c3ab01fbcf02c09ad29ad86219704a7 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -17,6 +17,7 @@
#include "base/i18n/time_formatting.h"
#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringize_macros.h"
#include "base/strings/stringprintf.h"
#include "base/sys_info.h"
#include "base/values.h"
@@ -36,7 +37,9 @@
#include "content/public/common/url_constants.h"
#include "gpu/config/gpu_feature_type.h"
#include "gpu/config/gpu_info.h"
+#include "skia/ext/skia_commit_hash.h"
#include "third_party/angle/src/common/version.h"
+#include "third_party/skia/include/core/SkMilestone.h"
#include "ui/gl/gpu_switching_manager.h"
#if defined(OS_LINUX) && defined(USE_X11)
@@ -486,7 +489,9 @@ base::Value* GpuMessageHandler::OnRequestClientInfo(
base::SysInfo::OperatingSystemName() + " " +
base::SysInfo::OperatingSystemVersion());
dict->SetString("angle_commit_id", ANGLE_COMMIT_HASH);
- dict->SetString("graphics_backend", "Skia");
+ dict->SetString("graphics_backend",
+ std::string("Skia/" STRINGIZE(SK_MILESTONE)
+ " " SKIA_COMMIT_HASH));
dict->SetString("blacklist_version",
GpuDataManagerImpl::GetInstance()->GetBlacklistVersion());
dict->SetString("driver_bug_list_version",
« no previous file with comments | « DEPS ('k') | skia/ext/.gitignore » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698