diff options
| author | pkasting <pkasting@chromium.org> | 2015-04-07 21:42:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-08 04:42:40 +0000 |
| commit | 379234c28f3856045a67af657296d6911156bbff (patch) | |
| tree | c0d7f0cab2fb491b97efec10fc8c444c49fc1ade /chrome/browser/task_manager/browser_process_resource_provider.cc | |
| parent | 8f0f3b63b8fd45d72ab957bdc12c714899199a72 (diff) | |
| download | chromium_src-379234c28f3856045a67af657296d6911156bbff.zip chromium_src-379234c28f3856045a67af657296d6911156bbff.tar.gz chromium_src-379234c28f3856045a67af657296d6911156bbff.tar.bz2 | |
Remove unnecessary instrumentation for several jank bugs.
BUG=437890,436671,455423,424386,436634,422516
TEST=none
TBR=jochen,cbentzel,jyasskin
Review URL: https://codereview.chromium.org/1062413002
Cr-Commit-Position: refs/heads/master@{#324185}
Diffstat (limited to 'chrome/browser/task_manager/browser_process_resource_provider.cc')
| -rw-r--r-- | chrome/browser/task_manager/browser_process_resource_provider.cc | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/chrome/browser/task_manager/browser_process_resource_provider.cc b/chrome/browser/task_manager/browser_process_resource_provider.cc index 72fcd1e9..319c817 100644 --- a/chrome/browser/task_manager/browser_process_resource_provider.cc +++ b/chrome/browser/task_manager/browser_process_resource_provider.cc @@ -33,25 +33,18 @@ gfx::ImageSkia* BrowserProcessResource::default_icon_ = NULL; BrowserProcessResource::BrowserProcessResource() : title_() { - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed. - tracked_objects::ScopedTracker tracking_profile1( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "437890 BrowserProcessResource::BrowserProcessResource1")); - #if defined(OS_WIN) if (!default_icon_) { - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed. - tracked_objects::ScopedTracker tracking_profile2( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "437890 BrowserProcessResource::BrowserProcessResource2")); + // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 GetAppIcon()")); HICON icon = GetAppIcon(); if (icon) { - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is + // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is // fixed. - tracked_objects::ScopedTracker tracking_profile3( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "437890 BrowserProcessResource::BrowserProcessResource3")); + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 CreateSkBitmapFromHICON()")); scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon)); default_icon_ = new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f)); @@ -59,6 +52,10 @@ BrowserProcessResource::BrowserProcessResource() } #elif defined(OS_POSIX) if (!default_icon_) { + // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 POSIX icon construction")); + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); default_icon_ = rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_16); } @@ -67,12 +64,9 @@ BrowserProcessResource::BrowserProcessResource() NOTIMPLEMENTED(); #endif // defined(OS_WIN) - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is - // fixed. + // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is fixed. tracked_objects::ScopedTracker tracking_profile4( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "437890 BrowserProcessResource::BrowserProcessResource4")); - + FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 MakeThreadSafe()")); default_icon_->MakeThreadSafe(); } |