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 12 matching lines...) Expand all Loading... | |
23 #include "base/utf_string_conversions.h" | 23 #include "base/utf_string_conversions.h" |
24 #include "base/values.h" | 24 #include "base/values.h" |
25 #include "base/win/scoped_com_initializer.h" | 25 #include "base/win/scoped_com_initializer.h" |
26 #include "content/common/appcache/appcache_dispatcher.h" | 26 #include "content/common/appcache/appcache_dispatcher.h" |
27 #include "content/common/child_process_messages.h" | 27 #include "content/common/child_process_messages.h" |
28 #include "content/common/database_messages.h" | 28 #include "content/common/database_messages.h" |
29 #include "content/common/db_message_filter.h" | 29 #include "content/common/db_message_filter.h" |
30 #include "content/common/dom_storage_messages.h" | 30 #include "content/common/dom_storage_messages.h" |
31 #include "content/common/gpu/client/gpu_channel_host.h" | 31 #include "content/common/gpu/client/gpu_channel_host.h" |
32 #include "content/common/gpu/gpu_messages.h" | 32 #include "content/common/gpu/gpu_messages.h" |
33 #include "content/common/indexed_db/indexed_db_dispatcher.h" | |
34 #include "content/common/indexed_db/indexed_db_message_filter.h" | 33 #include "content/common/indexed_db/indexed_db_message_filter.h" |
35 #include "content/common/indexed_db/proxy_webidbfactory_impl.h" | |
36 #include "content/common/npobject_util.h" | 34 #include "content/common/npobject_util.h" |
37 #include "content/common/plugin_messages.h" | 35 #include "content/common/plugin_messages.h" |
38 #include "content/common/resource_dispatcher.h" | 36 #include "content/common/resource_dispatcher.h" |
39 #include "content/common/resource_messages.h" | 37 #include "content/common/resource_messages.h" |
40 #include "content/common/view_messages.h" | 38 #include "content/common/view_messages.h" |
41 #include "content/common/web_database_observer_impl.h" | 39 #include "content/common/web_database_observer_impl.h" |
42 #include "content/public/common/content_paths.h" | 40 #include "content/public/common/content_paths.h" |
43 #include "content/public/common/content_switches.h" | 41 #include "content/public/common/content_switches.h" |
44 #include "content/public/common/renderer_preferences.h" | 42 #include "content/public/common/renderer_preferences.h" |
45 #include "content/public/common/url_constants.h" | 43 #include "content/public/common/url_constants.h" |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 suspend_webkit_shared_timer_ = true; | 201 suspend_webkit_shared_timer_ = true; |
204 notify_webkit_of_modal_loop_ = true; | 202 notify_webkit_of_modal_loop_ = true; |
205 plugin_refresh_allowed_ = true; | 203 plugin_refresh_allowed_ = true; |
206 widget_count_ = 0; | 204 widget_count_ = 0; |
207 hidden_widget_count_ = 0; | 205 hidden_widget_count_ = 0; |
208 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; | 206 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; |
209 idle_notifications_to_skip_ = 0; | 207 idle_notifications_to_skip_ = 0; |
210 compositor_initialized_ = false; | 208 compositor_initialized_ = false; |
211 | 209 |
212 appcache_dispatcher_.reset(new AppCacheDispatcher(Get())); | 210 appcache_dispatcher_.reset(new AppCacheDispatcher(Get())); |
213 main_thread_indexed_db_dispatcher_.reset( | |
214 IndexedDBDispatcher::ThreadSpecificInstance()); | |
michaeln
2012/04/11 21:20:13
This change looks ok but it looks like we'll end u
| |
215 | 211 |
216 media_stream_center_ = NULL; | 212 media_stream_center_ = NULL; |
217 | 213 |
218 db_message_filter_ = new DBMessageFilter(); | 214 db_message_filter_ = new DBMessageFilter(); |
219 AddFilter(db_message_filter_.get()); | 215 AddFilter(db_message_filter_.get()); |
220 | 216 |
221 vc_manager_ = new VideoCaptureImplManager(); | 217 vc_manager_ = new VideoCaptureImplManager(); |
222 AddFilter(vc_manager_->video_capture_message_filter()); | 218 AddFilter(vc_manager_->video_capture_message_filter()); |
223 | 219 |
224 audio_input_message_filter_ = new AudioInputMessageFilter(); | 220 audio_input_message_filter_ = new AudioInputMessageFilter(); |
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
986 | 982 |
987 scoped_refptr<base::MessageLoopProxy> | 983 scoped_refptr<base::MessageLoopProxy> |
988 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 984 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
989 DCHECK(message_loop() == MessageLoop::current()); | 985 DCHECK(message_loop() == MessageLoop::current()); |
990 if (!file_thread_.get()) { | 986 if (!file_thread_.get()) { |
991 file_thread_.reset(new base::Thread("Renderer::FILE")); | 987 file_thread_.reset(new base::Thread("Renderer::FILE")); |
992 file_thread_->Start(); | 988 file_thread_->Start(); |
993 } | 989 } |
994 return file_thread_->message_loop_proxy(); | 990 return file_thread_->message_loop_proxy(); |
995 } | 991 } |
OLD | NEW |