Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 25 matching lines...) Expand all Loading... | |
| 36 #include "content/common/web_database_observer_impl.h" | 36 #include "content/common/web_database_observer_impl.h" |
| 37 #include "content/public/common/content_switches.h" | 37 #include "content/public/common/content_switches.h" |
| 38 #include "content/public/common/renderer_preferences.h" | 38 #include "content/public/common/renderer_preferences.h" |
| 39 #include "content/public/renderer/content_renderer_client.h" | 39 #include "content/public/renderer/content_renderer_client.h" |
| 40 #include "content/public/renderer/render_process_observer.h" | 40 #include "content/public/renderer/render_process_observer.h" |
| 41 #include "content/public/renderer/render_view_visitor.h" | 41 #include "content/public/renderer/render_view_visitor.h" |
| 42 #include "content/renderer/devtools_agent_filter.h" | 42 #include "content/renderer/devtools_agent_filter.h" |
| 43 #include "content/renderer/gpu/compositor_thread.h" | 43 #include "content/renderer/gpu/compositor_thread.h" |
| 44 #include "content/renderer/gpu/gpu_channel_host.h" | 44 #include "content/renderer/gpu/gpu_channel_host.h" |
| 45 #include "content/renderer/indexed_db_dispatcher.h" | 45 #include "content/renderer/indexed_db_dispatcher.h" |
| 46 #include "content/renderer/indexed_db_message_filter.h" | |
|
michaeln
2011/11/30 21:48:14
is this needed?
dgrogan
2011/11/30 23:25:18
Nope, deleted.
| |
| 46 #include "content/renderer/media/audio_input_message_filter.h" | 47 #include "content/renderer/media/audio_input_message_filter.h" |
| 47 #include "content/renderer/media/audio_message_filter.h" | 48 #include "content/renderer/media/audio_message_filter.h" |
| 48 #include "content/renderer/media/video_capture_impl_manager.h" | 49 #include "content/renderer/media/video_capture_impl_manager.h" |
| 49 #include "content/renderer/media/video_capture_message_filter.h" | 50 #include "content/renderer/media/video_capture_message_filter.h" |
| 50 #include "content/renderer/plugin_channel_host.h" | 51 #include "content/renderer/plugin_channel_host.h" |
| 51 #include "content/renderer/render_process_impl.h" | 52 #include "content/renderer/render_process_impl.h" |
| 52 #include "content/renderer/render_view_impl.h" | 53 #include "content/renderer/render_view_impl.h" |
| 53 #include "content/renderer/renderer_webidbfactory_impl.h" | 54 #include "content/renderer/renderer_webidbfactory_impl.h" |
| 54 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 55 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 55 #include "ipc/ipc_channel_handle.h" | 56 #include "ipc/ipc_channel_handle.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 #if defined(OS_MACOSX) | 199 #if defined(OS_MACOSX) |
| 199 process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle, | 200 process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle, |
| 200 NULL)); | 201 NULL)); |
| 201 #else | 202 #else |
| 202 process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle)); | 203 process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle)); |
| 203 #endif | 204 #endif |
| 204 process_metrics_->GetCPUUsage(); // Initialize CPU usage counters. | 205 process_metrics_->GetCPUUsage(); // Initialize CPU usage counters. |
| 205 task_factory_.reset(new ScopedRunnableMethodFactory<RenderThreadImpl>(this)); | 206 task_factory_.reset(new ScopedRunnableMethodFactory<RenderThreadImpl>(this)); |
| 206 | 207 |
| 207 appcache_dispatcher_.reset(new AppCacheDispatcher(Get())); | 208 appcache_dispatcher_.reset(new AppCacheDispatcher(Get())); |
| 208 indexed_db_dispatcher_.reset(new IndexedDBDispatcher()); | |
| 209 | 209 |
| 210 db_message_filter_ = new DBMessageFilter(); | 210 db_message_filter_ = new DBMessageFilter(); |
| 211 AddFilter(db_message_filter_.get()); | 211 AddFilter(db_message_filter_.get()); |
| 212 | 212 |
| 213 vc_manager_ = new VideoCaptureImplManager(); | 213 vc_manager_ = new VideoCaptureImplManager(); |
| 214 AddFilter(vc_manager_->video_capture_message_filter()); | 214 AddFilter(vc_manager_->video_capture_message_filter()); |
| 215 | 215 |
| 216 audio_input_message_filter_ = new AudioInputMessageFilter(); | 216 audio_input_message_filter_ = new AudioInputMessageFilter(); |
| 217 AddFilter(audio_input_message_filter_.get()); | 217 AddFilter(audio_input_message_filter_.get()); |
| 218 | 218 |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 702 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); | 702 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); |
| 703 RenderProcessObserver* observer; | 703 RenderProcessObserver* observer; |
| 704 while ((observer = it.GetNext()) != NULL) { | 704 while ((observer = it.GetNext()) != NULL) { |
| 705 if (observer->OnControlMessageReceived(msg)) | 705 if (observer->OnControlMessageReceived(msg)) |
| 706 return true; | 706 return true; |
| 707 } | 707 } |
| 708 | 708 |
| 709 // Some messages are handled by delegates. | 709 // Some messages are handled by delegates. |
| 710 if (appcache_dispatcher_->OnMessageReceived(msg)) | 710 if (appcache_dispatcher_->OnMessageReceived(msg)) |
| 711 return true; | 711 return true; |
| 712 if (indexed_db_dispatcher_->OnMessageReceived(msg)) | |
| 713 return true; | |
| 714 | 712 |
| 715 bool handled = true; | 713 bool handled = true; |
| 716 IPC_BEGIN_MESSAGE_MAP(RenderThreadImpl, msg) | 714 IPC_BEGIN_MESSAGE_MAP(RenderThreadImpl, msg) |
| 717 IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForCurrentURL, | 715 IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForCurrentURL, |
| 718 OnSetZoomLevelForCurrentURL) | 716 OnSetZoomLevelForCurrentURL) |
| 719 IPC_MESSAGE_HANDLER(ViewMsg_SetNextPageID, OnSetNextPageID) | 717 IPC_MESSAGE_HANDLER(ViewMsg_SetNextPageID, OnSetNextPageID) |
| 720 IPC_MESSAGE_HANDLER(ViewMsg_SetCSSColors, OnSetCSSColors) | 718 IPC_MESSAGE_HANDLER(ViewMsg_SetCSSColors, OnSetCSSColors) |
| 721 // TODO(port): removed from render_messages_internal.h; | 719 // TODO(port): removed from render_messages_internal.h; |
| 722 // is there a new non-windows message I should add here? | 720 // is there a new non-windows message I should add here? |
| 723 IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView) | 721 IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView) |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 847 | 845 |
| 848 scoped_refptr<base::MessageLoopProxy> | 846 scoped_refptr<base::MessageLoopProxy> |
| 849 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 847 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 850 DCHECK(message_loop() == MessageLoop::current()); | 848 DCHECK(message_loop() == MessageLoop::current()); |
| 851 if (!file_thread_.get()) { | 849 if (!file_thread_.get()) { |
| 852 file_thread_.reset(new base::Thread("Renderer::FILE")); | 850 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 853 file_thread_->Start(); | 851 file_thread_->Start(); |
| 854 } | 852 } |
| 855 return file_thread_->message_loop_proxy(); | 853 return file_thread_->message_loop_proxy(); |
| 856 } | 854 } |
| OLD | NEW |