diff options
| author | jmadill@chromium.org <jmadill@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 22:41:46 +0000 |
|---|---|---|
| committer | jmadill@chromium.org <jmadill@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 22:41:46 +0000 |
| commit | 46434f1eaf397bc5165ee7efaf6d5f3656f1546c (patch) | |
| tree | 0102e4058c296e5ab817677846859e15601edb62 | |
| parent | 3ce5d41ae1a20925bdafe28d13f77c1be81b88f3 (diff) | |
| download | chromium_src-46434f1eaf397bc5165ee7efaf6d5f3656f1546c.zip chromium_src-46434f1eaf397bc5165ee7efaf6d5f3656f1546c.tar.gz chromium_src-46434f1eaf397bc5165ee7efaf6d5f3656f1546c.tar.bz2 | |
Roll ANGLE deps, with new commit id versioning.
Instead of tracking ANGLE revisions manually, we've switched to
automatically embedding a commit id header. The ANGLE roll means
we need to update Chrome to the new version tracking.
BUG=343676
Review URL: https://codereview.chromium.org/164913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251862 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_internals_ui.cc | 2 | ||||
| -rw-r--r-- | content/browser/resources/gpu/info_view.js | 4 | ||||
| -rw-r--r-- | content/content_browser.gypi | 1 |
4 files changed, 5 insertions, 4 deletions
@@ -82,7 +82,7 @@ deps = { "src/third_party/angle": Var("chromium_git") + - "/angle/angle.git@a25382b9b37ddc50d19427b88ee2ad770d7f9f1d", + "/angle/angle.git@4df02c1ed5e97dd54576b06964b1da67ea30238e", "src/third_party/trace-viewer": (Var("googlecode_url") % "trace-viewer") + "/trunk@1133", diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index 6b8c678..cb67a6d 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -324,7 +324,7 @@ base::Value* GpuMessageHandler::OnRequestClientInfo( dict->SetString("operating_system", base::SysInfo::OperatingSystemName() + " " + base::SysInfo::OperatingSystemVersion()); - dict->SetString("angle_revision", base::UintToString(BUILD_REVISION)); + dict->SetString("angle_commit_id", ANGLE_COMMIT_HASH); dict->SetString("graphics_backend", "Skia"); dict->SetString("blacklist_version", GpuDataManagerImpl::GetInstance()->GetBlacklistVersion()); diff --git a/content/browser/resources/gpu/info_view.js b/content/browser/resources/gpu/info_view.js index e736d8e..a8fc3fc 100644 --- a/content/browser/resources/gpu/info_view.js +++ b/content/browser/resources/gpu/info_view.js @@ -64,8 +64,8 @@ cr.define('gpu', function() { value: clientInfo.driver_bug_list_version }, { - description: 'ANGLE revision', - value: clientInfo.angle_revision + description: 'ANGLE commit id', + value: clientInfo.angle_commit_id }, { description: '2D graphics backend', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 3749fe5..e97081d 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1351,6 +1351,7 @@ '../webkit/storage_common.gyp:webkit_storage_common', '../webkit/webkit_resources.gyp:webkit_resources', '../webkit/webkit_resources.gyp:webkit_strings', + '../third_party/angle/src/build_angle.gyp:commit_id', ], }], ['enable_printing!=0', { |