summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-20 19:06:40 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-20 19:06:40 +0000
commitd6ae80f85ac718a65bba55780f6efec4a9bcdd4c (patch)
tree787252bc075cb7c21b6263cfdbae55a90342d86a
parentbd6b83a65e0e02a5414cedf77c0b7b6dbbfde94f (diff)
downloadchromium_src-d6ae80f85ac718a65bba55780f6efec4a9bcdd4c.zip
chromium_src-d6ae80f85ac718a65bba55780f6efec4a9bcdd4c.tar.gz
chromium_src-d6ae80f85ac718a65bba55780f6efec4a9bcdd4c.tar.bz2
Fix a bug in unmangling hashed shader names in logs.
Want to land this tiny fix first for merging back. Will get some tests in a follow-up patch. BUG=177094 TEST=url in the bug report TBR=gman Review URL: https://codereview.chromium.org/12317014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183583 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/command_buffer/service/program_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
index 9e8d19c..81a0cb7 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -157,7 +157,7 @@ std::string ProgramManager::ProgramInfo::ProcessLogInfo(
std::string prior_log;
std::string hashed_name;
while (RE2::Consume(&input,
- "(.*)_(webgl_[0123456789abcdefABCDEF]+)",
+ "(.*)(webgl_[0123456789abcdefABCDEF]+)",
&prior_log,
&hashed_name)) {
output += prior_log;