summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 20:03:47 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 20:03:47 +0000
commit92c2d90545462a8952c193375009c3d8ef7b1f68 (patch)
treea8417f11873b6056b7f3b68e68b9a4535827a6ca /chrome/browser
parent90660cd977d1c1f592d100291724c18947f2a9b0 (diff)
downloadchromium_src-92c2d90545462a8952c193375009c3d8ef7b1f68.zip
chromium_src-92c2d90545462a8952c193375009c3d8ef7b1f68.tar.gz
chromium_src-92c2d90545462a8952c193375009c3d8ef7b1f68.tar.bz2
Fix the merging of threadnames with multiple digits on about:profiler.
... for real this time! Problem is the first (.*) is greedy, so it gobbles up all but the last digit. Review URL: http://codereview.chromium.org/8672009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/profiler.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/resources/profiler.js b/chrome/browser/resources/profiler.js
index 0730578..c49a25f 100644
--- a/chrome/browser/resources/profiler.js
+++ b/chrome/browser/resources/profiler.js
@@ -878,7 +878,7 @@ var MainView = (function() {
var value = row[key];
// If the property is a thread name, try to remap it.
if (key == KEY_BIRTH_THREAD || key == KEY_DEATH_THREAD) {
- var m = /^(.*)(\d+)$/.exec(value);
+ var m = /^(.*[^\d])(\d+)$/.exec(value);
if (m)
value = m[1] + '*';
}