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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comment on RenderWidgetWindowTreeClientFactory lifetime Created 5 years 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/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #include "content/renderer/media/render_media_client.h" 107 #include "content/renderer/media/render_media_client.h"
108 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" 108 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
109 #include "content/renderer/media/video_capture_impl_manager.h" 109 #include "content/renderer/media/video_capture_impl_manager.h"
110 #include "content/renderer/media/video_capture_message_filter.h" 110 #include "content/renderer/media/video_capture_message_filter.h"
111 #include "content/renderer/net_info_helper.h" 111 #include "content/renderer/net_info_helper.h"
112 #include "content/renderer/p2p/socket_dispatcher.h" 112 #include "content/renderer/p2p/socket_dispatcher.h"
113 #include "content/renderer/raster_worker_pool.h" 113 #include "content/renderer/raster_worker_pool.h"
114 #include "content/renderer/render_frame_proxy.h" 114 #include "content/renderer/render_frame_proxy.h"
115 #include "content/renderer/render_process_impl.h" 115 #include "content/renderer/render_process_impl.h"
116 #include "content/renderer/render_view_impl.h" 116 #include "content/renderer/render_view_impl.h"
117 #include "content/renderer/render_widget_window_tree_client_factory.h"
117 #include "content/renderer/renderer_blink_platform_impl.h" 118 #include "content/renderer/renderer_blink_platform_impl.h"
118 #include "content/renderer/scheduler/resource_dispatch_throttler.h" 119 #include "content/renderer/scheduler/resource_dispatch_throttler.h"
119 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" 120 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
120 #include "content/renderer/service_worker/service_worker_context_client.h" 121 #include "content/renderer/service_worker/service_worker_context_client.h"
121 #include "content/renderer/service_worker/service_worker_context_message_filter. h" 122 #include "content/renderer/service_worker/service_worker_context_message_filter. h"
122 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" 123 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
123 #include "gin/public/debug.h" 124 #include "gin/public/debug.h"
124 #include "gpu/GLES2/gl2extchromium.h" 125 #include "gpu/GLES2/gl2extchromium.h"
125 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 126 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
126 #include "ipc/ipc_channel_handle.h" 127 #include "ipc/ipc_channel_handle.h"
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 raster_worker_pool_->Start(num_raster_threads, thread_options); 762 raster_worker_pool_->Start(num_raster_threads, thread_options);
762 763
763 // TODO(boliu): In single process, browser main loop should set up the 764 // TODO(boliu): In single process, browser main loop should set up the
764 // discardable memory manager, and should skip this if kSingleProcess. 765 // discardable memory manager, and should skip this if kSingleProcess.
765 // See crbug.com/503724. 766 // See crbug.com/503724.
766 base::DiscardableMemoryAllocator::SetInstance( 767 base::DiscardableMemoryAllocator::SetInstance(
767 ChildThreadImpl::discardable_shared_memory_manager()); 768 ChildThreadImpl::discardable_shared_memory_manager());
768 769
769 service_registry()->AddService<EmbeddedWorkerSetup>( 770 service_registry()->AddService<EmbeddedWorkerSetup>(
770 base::Bind(CreateEmbeddedWorkerSetup)); 771 base::Bind(CreateEmbeddedWorkerSetup));
772
773 #if defined(MOJO_SHELL_CLIENT)
774 CreateRenderWidgetWindowTreeClientFactory();
775 #endif
771 } 776 }
772 777
773 RenderThreadImpl::~RenderThreadImpl() { 778 RenderThreadImpl::~RenderThreadImpl() {
774 } 779 }
775 780
776 void RenderThreadImpl::Shutdown() { 781 void RenderThreadImpl::Shutdown() {
777 FOR_EACH_OBSERVER( 782 FOR_EACH_OBSERVER(
778 RenderProcessObserver, observers_, OnRenderProcessShutdown()); 783 RenderProcessObserver, observers_, OnRenderProcessShutdown());
779 784
780 ChildThreadImpl::Shutdown(); 785 ChildThreadImpl::Shutdown();
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1973 1978
1974 void RenderThreadImpl::ReleaseFreeMemory() { 1979 void RenderThreadImpl::ReleaseFreeMemory() {
1975 base::allocator::ReleaseFreeMemory(); 1980 base::allocator::ReleaseFreeMemory();
1976 discardable_shared_memory_manager()->ReleaseFreeMemory(); 1981 discardable_shared_memory_manager()->ReleaseFreeMemory();
1977 1982
1978 if (blink_platform_impl_) 1983 if (blink_platform_impl_)
1979 blink::decommitFreeableMemory(); 1984 blink::decommitFreeableMemory();
1980 } 1985 }
1981 1986
1982 } // namespace content 1987 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698