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

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

Issue 462983002: GN: Make content_shell and webkit_unit_tests work in component build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "content/renderer/gpu/compositor_output_surface.h" 74 #include "content/renderer/gpu/compositor_output_surface.h"
75 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 75 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
76 #include "content/renderer/input/input_event_filter.h" 76 #include "content/renderer/input/input_event_filter.h"
77 #include "content/renderer/input/input_handler_manager.h" 77 #include "content/renderer/input/input_handler_manager.h"
78 #include "content/renderer/media/aec_dump_message_filter.h" 78 #include "content/renderer/media/aec_dump_message_filter.h"
79 #include "content/renderer/media/audio_input_message_filter.h" 79 #include "content/renderer/media/audio_input_message_filter.h"
80 #include "content/renderer/media/audio_message_filter.h" 80 #include "content/renderer/media/audio_message_filter.h"
81 #include "content/renderer/media/audio_renderer_mixer_manager.h" 81 #include "content/renderer/media/audio_renderer_mixer_manager.h"
82 #include "content/renderer/media/media_stream_center.h" 82 #include "content/renderer/media/media_stream_center.h"
83 #include "content/renderer/media/midi_message_filter.h" 83 #include "content/renderer/media/midi_message_filter.h"
84 #include "content/renderer/media/peer_connection_tracker.h"
85 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" 84 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
86 #include "content/renderer/media/rtc_peer_connection_handler.h"
87 #include "content/renderer/media/video_capture_impl_manager.h" 85 #include "content/renderer/media/video_capture_impl_manager.h"
88 #include "content/renderer/media/video_capture_message_filter.h" 86 #include "content/renderer/media/video_capture_message_filter.h"
89 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
90 #include "content/renderer/media/webrtc_identity_service.h"
91 #include "content/renderer/net_info_helper.h" 87 #include "content/renderer/net_info_helper.h"
92 #include "content/renderer/p2p/socket_dispatcher.h" 88 #include "content/renderer/p2p/socket_dispatcher.h"
93 #include "content/renderer/render_frame_proxy.h" 89 #include "content/renderer/render_frame_proxy.h"
94 #include "content/renderer/render_process_impl.h" 90 #include "content/renderer/render_process_impl.h"
95 #include "content/renderer/render_view_impl.h" 91 #include "content/renderer/render_view_impl.h"
96 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 92 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
97 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h" 93 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h"
98 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" 94 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
99 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" 95 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
100 #include "grit/content_resources.h" 96 #include "grit/content_resources.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 #include <objbase.h> 141 #include <objbase.h>
146 #else 142 #else
147 // TODO(port) 143 // TODO(port)
148 #include "content/child/npapi/np_channel_base.h" 144 #include "content/child/npapi/np_channel_base.h"
149 #endif 145 #endif
150 146
151 #if defined(ENABLE_PLUGINS) 147 #if defined(ENABLE_PLUGINS)
152 #include "content/renderer/npapi/plugin_channel_host.h" 148 #include "content/renderer/npapi/plugin_channel_host.h"
153 #endif 149 #endif
154 150
151 #if defined(ENABLE_WEBRTC)
152 #include "content/renderer/media/peer_connection_tracker.h"
153 #include "content/renderer/media/rtc_peer_connection_handler.h"
154 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
155 #include "content/renderer/media/webrtc_identity_service.h"
156 #endif
157
155 using base::ThreadRestrictions; 158 using base::ThreadRestrictions;
156 using blink::WebDocument; 159 using blink::WebDocument;
157 using blink::WebFrame; 160 using blink::WebFrame;
158 using blink::WebNetworkStateNotifier; 161 using blink::WebNetworkStateNotifier;
159 using blink::WebRuntimeFeatures; 162 using blink::WebRuntimeFeatures;
160 using blink::WebScriptController; 163 using blink::WebScriptController;
161 using blink::WebSecurityPolicy; 164 using blink::WebSecurityPolicy;
162 using blink::WebString; 165 using blink::WebString;
163 using blink::WebView; 166 using blink::WebView;
164 167
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 scoped_ptr<MediaStreamCenter> media_stream_center( 1453 scoped_ptr<MediaStreamCenter> media_stream_center(
1451 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory())); 1454 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory()));
1452 AddObserver(media_stream_center.get()); 1455 AddObserver(media_stream_center.get());
1453 media_stream_center_ = media_stream_center.release(); 1456 media_stream_center_ = media_stream_center.release();
1454 } 1457 }
1455 } 1458 }
1456 #endif 1459 #endif
1457 return media_stream_center_; 1460 return media_stream_center_;
1458 } 1461 }
1459 1462
1463 #if defined(ENABLE_WEBRTC)
1460 PeerConnectionDependencyFactory* 1464 PeerConnectionDependencyFactory*
1461 RenderThreadImpl::GetPeerConnectionDependencyFactory() { 1465 RenderThreadImpl::GetPeerConnectionDependencyFactory() {
1462 return peer_connection_factory_.get(); 1466 return peer_connection_factory_.get();
1463 } 1467 }
1468 #endif
1464 1469
1465 GpuChannelHost* RenderThreadImpl::GetGpuChannel() { 1470 GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
1466 if (!gpu_channel_.get()) 1471 if (!gpu_channel_.get())
1467 return NULL; 1472 return NULL;
1468 1473
1469 if (gpu_channel_->IsLost()) 1474 if (gpu_channel_->IsLost())
1470 return NULL; 1475 return NULL;
1471 1476
1472 return gpu_channel_.get(); 1477 return gpu_channel_.get();
1473 } 1478 }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 hidden_widget_count_--; 1638 hidden_widget_count_--;
1634 1639
1635 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1640 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1636 return; 1641 return;
1637 } 1642 }
1638 1643
1639 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1644 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1640 } 1645 }
1641 1646
1642 } // namespace content 1647 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698