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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.h

Issue 2385053002: Revert of Check that all shared workers are terminated. (patchset #2 id:170001 of https://c… (Closed)
Patch Set: fix merge conflict again Created 4 years, 2 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 const GURL& url); 243 const GURL& url);
244 244
245 static base::MessageLoop* GetInProcessRendererThreadForTesting(); 245 static base::MessageLoop* GetInProcessRendererThreadForTesting();
246 246
247 // This forces a renderer that is running "in process" to shut down. 247 // This forces a renderer that is running "in process" to shut down.
248 static void ShutDownInProcessRenderer(); 248 static void ShutDownInProcessRenderer();
249 249
250 static void RegisterRendererMainThreadFactory( 250 static void RegisterRendererMainThreadFactory(
251 RendererMainThreadFactoryFunction create); 251 RendererMainThreadFactoryFunction create);
252 252
253 // TODO(alokp): Remove after collecting crash data.
254 // Temporary checks to verify that all shared workers are terminated.
255 // It is suspected that shared workers prevent render process hosts
256 // from shutting down: crbug.com/608049
257 static void CheckAllWorkersTerminated();
258
259 RenderFrameMessageFilter* render_frame_message_filter_for_testing() const { 253 RenderFrameMessageFilter* render_frame_message_filter_for_testing() const {
260 return render_frame_message_filter_.get(); 254 return render_frame_message_filter_.get();
261 } 255 }
262 256
263 MessagePortMessageFilter* message_port_message_filter() const { 257 MessagePortMessageFilter* message_port_message_filter() const {
264 return message_port_message_filter_.get(); 258 return message_port_message_filter_.get();
265 } 259 }
266 260
267 NotificationMessageFilter* notification_message_filter() const { 261 NotificationMessageFilter* notification_message_filter() const {
268 return notification_message_filter_.get(); 262 return notification_message_filter_.get();
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 instance_weak_factory_; 583 instance_weak_factory_;
590 584
591 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_; 585 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
592 586
593 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl); 587 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
594 }; 588 };
595 589
596 } // namespace content 590 } // namespace content
597 591
598 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_ 592 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/browser_process_sub_thread.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698