diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 21:11:55 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 21:11:55 +0000 |
| commit | 90e888c657e928a56e4c67fa84f85354e0fc7748 (patch) | |
| tree | ce7018140c4c6b016ae14b50dabb9aaa1726ffa4 | |
| parent | 5c6fba213aa439681f5e044808e09b5d4933f3b1 (diff) | |
| download | chromium_src-90e888c657e928a56e4c67fa84f85354e0fc7748.zip chromium_src-90e888c657e928a56e4c67fa84f85354e0fc7748.tar.gz chromium_src-90e888c657e928a56e4c67fa84f85354e0fc7748.tar.bz2 | |
Revert 73013 - Delete tab_loader when there are no more tabs to be loaded or painted
BUG=6371017
TEST=Valgrind of RunInBackgroundTest.RunInBackgroundBasicTest doesn't
leak after revert of
http://src.chromium.org/viewvc/chrome?view=rev&revision=72968
Review URL: http://codereview.chromium.org/6272028
TBR=davemoore@chromium.org
Review URL: http://codereview.chromium.org/6376017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73020 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 3 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index b1499ea..3689b8a 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -321,8 +321,7 @@ void TabLoader::Observe(NotificationType type, NOTREACHED() << "Unknown notification received:" << type.value; } // Delete ourselves when we're not waiting for any more notifications. - if ((got_first_paint_ || render_widget_hosts_to_paint_.empty()) && - tabs_loading_.empty() && tabs_to_load_.empty()) + if (got_first_paint_&& tabs_loading_.empty() && tabs_to_load_.empty()) delete this; } diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 2eab475..cece68b 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -3684,6 +3684,11 @@ bug_71152 Memcheck:Leak fun:_Znw* + fun:_ZN71_GLOBAL__N_chrome_browser_sessions_session_restore.cc* + fun:_ZN71_GLOBAL__N_chrome_browser_sessions_session_restore.cc* + fun:_ZN71_GLOBAL__N_chrome_browser_sessions_session_restore.cc* + fun:_Z16DispatchToMethodIN71_GLOBAL__N_chrome_browser_sessions_session_restore.cc* + fun:_ZN12CallbackImplIN71_GLOBAL__N_chrome_browser_sessions_session_restore.cc* fun:_ZN14SessionService20OnGotSessionCommandsEi13scoped_refptrIN18BaseSessionService26InternalGetCommandsRequestEE fun:_Z16DispatchToMethodI14SessionServiceMS0_Fvi13scoped_refptrIN18BaseSessionService26InternalGetCommandsRequestEEEiS4_EvPT_T0_RK6Tuple2IT1_T2_E fun:_ZN12CallbackImplI14SessionServiceMS0_Fvi13scoped_refptrIN18BaseSessionService26InternalGetCommandsRequestEEE6Tuple2IiS4_EE13RunWithParamsERKS8_ |