OLD | NEW |
---|---|
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 61 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
62 #include "content/renderer/media/media_stream_center.h" | 62 #include "content/renderer/media/media_stream_center.h" |
63 #include "content/renderer/media/media_stream_dependency_factory.h" | 63 #include "content/renderer/media/media_stream_dependency_factory.h" |
64 #include "content/renderer/media/video_capture_impl_manager.h" | 64 #include "content/renderer/media/video_capture_impl_manager.h" |
65 #include "content/renderer/media/video_capture_message_filter.h" | 65 #include "content/renderer/media/video_capture_message_filter.h" |
66 #include "content/renderer/p2p/socket_dispatcher.h" | 66 #include "content/renderer/p2p/socket_dispatcher.h" |
67 #include "content/renderer/plugin_channel_host.h" | 67 #include "content/renderer/plugin_channel_host.h" |
68 #include "content/renderer/render_process_impl.h" | 68 #include "content/renderer/render_process_impl.h" |
69 #include "content/renderer/render_view_impl.h" | 69 #include "content/renderer/render_view_impl.h" |
70 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 70 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
71 #include "googleurl/src/gurl.h" | |
jam
2012/12/19 01:39:39
nit: don't include this, it's a given and by defin
raymes
2012/12/19 02:59:29
Done.
| |
71 #include "grit/content_resources.h" | 72 #include "grit/content_resources.h" |
72 #include "ipc/ipc_channel_handle.h" | 73 #include "ipc/ipc_channel_handle.h" |
73 #include "ipc/ipc_forwarding_message_filter.h" | 74 #include "ipc/ipc_forwarding_message_filter.h" |
74 #include "ipc/ipc_platform_file.h" | 75 #include "ipc/ipc_platform_file.h" |
75 #include "media/base/media.h" | 76 #include "media/base/media.h" |
76 #include "media/base/media_switches.h" | 77 #include "media/base/media_switches.h" |
77 #include "net/base/net_errors.h" | 78 #include "net/base/net_errors.h" |
78 #include "net/base/net_util.h" | 79 #include "net/base/net_util.h" |
79 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" | 80 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" |
80 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSuppor t.h" | 81 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSuppor t.h" |
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
841 } else { | 842 } else { |
842 webkit_platform_support_->ResumeSharedTimer(); | 843 webkit_platform_support_->ResumeSharedTimer(); |
843 } | 844 } |
844 } | 845 } |
845 } | 846 } |
846 | 847 |
847 void RenderThreadImpl::UpdateHistograms(int sequence_number) { | 848 void RenderThreadImpl::UpdateHistograms(int sequence_number) { |
848 child_histogram_message_filter()->SendHistograms(sequence_number); | 849 child_histogram_message_filter()->SendHistograms(sequence_number); |
849 } | 850 } |
850 | 851 |
852 bool RenderThreadImpl::ResolveProxy(const GURL& url, std::string* proxy_list) { | |
853 bool result = false; | |
854 Send(new ViewHostMsg_ResolveProxy(url, &result, proxy_list)); | |
855 return result; | |
856 } | |
857 | |
851 void RenderThreadImpl::PostponeIdleNotification() { | 858 void RenderThreadImpl::PostponeIdleNotification() { |
852 idle_notifications_to_skip_ = 2; | 859 idle_notifications_to_skip_ = 2; |
853 } | 860 } |
854 | 861 |
855 /* static */ | 862 /* static */ |
856 void RenderThreadImpl::OnGpuVDAContextLoss() { | 863 void RenderThreadImpl::OnGpuVDAContextLoss() { |
857 RenderThreadImpl* self = RenderThreadImpl::current(); | 864 RenderThreadImpl* self = RenderThreadImpl::current(); |
858 DCHECK(self); | 865 DCHECK(self); |
859 if (!self->gpu_vda_context3d_.get()) | 866 if (!self->gpu_vda_context3d_.get()) |
860 return; | 867 return; |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1137 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1144 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
1138 DCHECK(message_loop() == MessageLoop::current()); | 1145 DCHECK(message_loop() == MessageLoop::current()); |
1139 if (!file_thread_.get()) { | 1146 if (!file_thread_.get()) { |
1140 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1147 file_thread_.reset(new base::Thread("Renderer::FILE")); |
1141 file_thread_->Start(); | 1148 file_thread_->Start(); |
1142 } | 1149 } |
1143 return file_thread_->message_loop_proxy(); | 1150 return file_thread_->message_loop_proxy(); |
1144 } | 1151 } |
1145 | 1152 |
1146 } // namespace content | 1153 } // namespace content |
OLD | NEW |