Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: content/browser/browser_process_sub_thread.cc

Issue 2338113002: Revert "Reland of Check that all shared workers are terminated. (patchset #2 id:170001 of https://c… (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/browser_process_sub_thread.h" 5 #include "content/browser/browser_process_sub_thread.h"
6 6
7 #include "base/debug/leak_tracker.h" 7 #include "base/debug/leak_tracker.h"
8 #include "base/threading/thread_restrictions.h" 8 #include "base/threading/thread_restrictions.h"
9 #include "base/trace_event/memory_dump_manager.h" 9 #include "base/trace_event/memory_dump_manager.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/browser/browser_child_process_host_impl.h" 11 #include "content/browser/browser_child_process_host_impl.h"
12 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 12 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
13 #include "content/browser/notification_service_impl.h" 13 #include "content/browser/notification_service_impl.h"
14 #include "content/browser/shared_worker/shared_worker_service_impl.h"
15 #include "net/url_request/url_fetcher.h" 14 #include "net/url_request/url_fetcher.h"
16 #include "net/url_request/url_request.h" 15 #include "net/url_request/url_request.h"
17 16
18 #if defined(OS_WIN) 17 #if defined(OS_WIN)
19 #include "base/win/scoped_com_initializer.h" 18 #include "base/win/scoped_com_initializer.h"
20 #endif 19 #endif
21 20
22 namespace content { 21 namespace content {
23 22
24 BrowserProcessSubThread::BrowserProcessSubThread(BrowserThread::ID identifier) 23 BrowserProcessSubThread::BrowserProcessSubThread(BrowserThread::ID identifier)
(...skipping 29 matching lines...) Expand all
54 BrowserThreadImpl::CleanUp(); 53 BrowserThreadImpl::CleanUp();
55 54
56 notification_service_.reset(); 55 notification_service_.reset();
57 56
58 #if defined(OS_WIN) 57 #if defined(OS_WIN)
59 com_initializer_.reset(); 58 com_initializer_.reset();
60 #endif 59 #endif
61 } 60 }
62 61
63 void BrowserProcessSubThread::IOThreadPreCleanUp() { 62 void BrowserProcessSubThread::IOThreadPreCleanUp() {
64 // TODO(alokp): Remove after collecting crash data.
65 // Temporary checks to verify that all shared workers are terminated.
66 // It is suspected that shared workers prevent render process hosts
67 // from shutting down: crbug.com/608049
68 SharedWorkerServiceImpl::GetInstance()->CheckAllWorkersTerminated();
69
70 // Kill all things that might be holding onto 63 // Kill all things that might be holding onto
71 // net::URLRequest/net::URLRequestContexts. 64 // net::URLRequest/net::URLRequestContexts.
72 65
73 // Destroy all URLRequests started by URLFetchers. 66 // Destroy all URLRequests started by URLFetchers.
74 net::URLFetcher::CancelAll(); 67 net::URLFetcher::CancelAll();
75 68
76 // If any child processes are still running, terminate them and 69 // If any child processes are still running, terminate them and
77 // and delete the BrowserChildProcessHost instances to release whatever 70 // and delete the BrowserChildProcessHost instances to release whatever
78 // IO thread only resources they are referencing. 71 // IO thread only resources they are referencing.
79 BrowserChildProcessHostImpl::TerminateAll(); 72 BrowserChildProcessHostImpl::TerminateAll();
80 73
81 // Unregister GpuMemoryBuffer dump provider before IO thread is shut down. 74 // Unregister GpuMemoryBuffer dump provider before IO thread is shut down.
82 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider( 75 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
83 BrowserGpuMemoryBufferManager::current()); 76 BrowserGpuMemoryBufferManager::current());
84 } 77 }
85 78
86 } // namespace content 79 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698