diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
| commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
| tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/content/browser/browser_process_sub_thread.cc | |
| parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
| download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz | |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
| -rw-r--r-- | chromium/content/browser/browser_process_sub_thread.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc index 9a5b78a9edb..b1904e10971 100644 --- a/chromium/content/browser/browser_process_sub_thread.cc +++ b/chromium/content/browser/browser_process_sub_thread.cc @@ -6,8 +6,10 @@ #include "base/debug/leak_tracker.h" #include "base/threading/thread_restrictions.h" +#include "base/trace_event/memory_dump_manager.h" #include "build/build_config.h" #include "content/browser/browser_child_process_host_impl.h" +#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" #include "content/browser/notification_service_impl.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request.h" @@ -70,6 +72,10 @@ void BrowserProcessSubThread::IOThreadPreCleanUp() { // IO thread only resources they are referencing. BrowserChildProcessHostImpl::TerminateAll(); #endif // !defined(OS_IOS) + + // Unregister GpuMemoryBuffer dump provider before IO thread is shut down. + base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider( + BrowserGpuMemoryBufferManager::current()); } } // namespace content |