OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/renderer/render_thread.h" | 5 #include "chrome/renderer/render_thread.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/renderer/extensions/extension_process_bindings.h" | 37 #include "chrome/renderer/extensions/extension_process_bindings.h" |
38 #include "chrome/renderer/extensions/js_only_v8_extensions.h" | 38 #include "chrome/renderer/extensions/js_only_v8_extensions.h" |
39 #include "chrome/renderer/extensions/renderer_extension_bindings.h" | 39 #include "chrome/renderer/extensions/renderer_extension_bindings.h" |
40 #include "chrome/renderer/external_extension.h" | 40 #include "chrome/renderer/external_extension.h" |
41 #include "chrome/renderer/loadtimes_extension_bindings.h" | 41 #include "chrome/renderer/loadtimes_extension_bindings.h" |
42 #include "chrome/renderer/net/render_dns_master.h" | 42 #include "chrome/renderer/net/render_dns_master.h" |
43 #include "chrome/renderer/render_process.h" | 43 #include "chrome/renderer/render_process.h" |
44 #include "chrome/renderer/render_view.h" | 44 #include "chrome/renderer/render_view.h" |
45 #include "chrome/renderer/renderer_webkitclient_impl.h" | 45 #include "chrome/renderer/renderer_webkitclient_impl.h" |
46 #include "chrome/renderer/renderer_web_database_observer.h" | 46 #include "chrome/renderer/renderer_web_database_observer.h" |
| 47 #include "chrome/renderer/socket_stream_dispatcher.h" |
47 #include "chrome/renderer/user_script_slave.h" | 48 #include "chrome/renderer/user_script_slave.h" |
48 #include "ipc/ipc_message.h" | 49 #include "ipc/ipc_message.h" |
49 #include "webkit/api/public/WebCache.h" | 50 #include "webkit/api/public/WebCache.h" |
50 #include "webkit/api/public/WebColor.h" | 51 #include "webkit/api/public/WebColor.h" |
51 #include "webkit/api/public/WebCrossOriginPreflightResultCache.h" | 52 #include "webkit/api/public/WebCrossOriginPreflightResultCache.h" |
52 #include "webkit/api/public/WebFontCache.h" | 53 #include "webkit/api/public/WebFontCache.h" |
53 #include "webkit/api/public/WebColor.h" | 54 #include "webkit/api/public/WebColor.h" |
54 #include "webkit/api/public/WebDatabase.h" | 55 #include "webkit/api/public/WebDatabase.h" |
55 #include "webkit/api/public/WebKit.h" | 56 #include "webkit/api/public/WebKit.h" |
56 #include "webkit/api/public/WebScriptController.h" | 57 #include "webkit/api/public/WebScriptController.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 widget_count_ = 0; | 133 widget_count_ = 0; |
133 hidden_widget_count_ = 0; | 134 hidden_widget_count_ = 0; |
134 idle_notification_delay_in_s_ = kInitialIdleHandlerDelayS; | 135 idle_notification_delay_in_s_ = kInitialIdleHandlerDelayS; |
135 task_factory_.reset(new ScopedRunnableMethodFactory<RenderThread>(this)); | 136 task_factory_.reset(new ScopedRunnableMethodFactory<RenderThread>(this)); |
136 | 137 |
137 visited_link_slave_.reset(new VisitedLinkSlave()); | 138 visited_link_slave_.reset(new VisitedLinkSlave()); |
138 user_script_slave_.reset(new UserScriptSlave()); | 139 user_script_slave_.reset(new UserScriptSlave()); |
139 dns_master_.reset(new RenderDnsMaster()); | 140 dns_master_.reset(new RenderDnsMaster()); |
140 histogram_snapshots_.reset(new RendererHistogramSnapshots()); | 141 histogram_snapshots_.reset(new RendererHistogramSnapshots()); |
141 appcache_dispatcher_.reset(new AppCacheDispatcher(this)); | 142 appcache_dispatcher_.reset(new AppCacheDispatcher(this)); |
| 143 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); |
142 devtools_agent_filter_ = new DevToolsAgentFilter(); | 144 devtools_agent_filter_ = new DevToolsAgentFilter(); |
143 AddFilter(devtools_agent_filter_.get()); | 145 AddFilter(devtools_agent_filter_.get()); |
144 db_message_filter_ = new DBMessageFilter(); | 146 db_message_filter_ = new DBMessageFilter(); |
145 AddFilter(db_message_filter_.get()); | 147 AddFilter(db_message_filter_.get()); |
146 | 148 |
147 #if defined(OS_POSIX) | 149 #if defined(OS_POSIX) |
148 suicide_on_channel_error_filter_ = new SuicideOnChannelErrorFilter; | 150 suicide_on_channel_error_filter_ = new SuicideOnChannelErrorFilter; |
149 AddFilter(suicide_on_channel_error_filter_.get()); | 151 AddFilter(suicide_on_channel_error_filter_.get()); |
150 #endif | 152 #endif |
151 } | 153 } |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 void RenderThread::OnExtensionSetL10nMessages( | 272 void RenderThread::OnExtensionSetL10nMessages( |
271 const std::string& extension_id, | 273 const std::string& extension_id, |
272 const std::map<std::string, std::string>& l10n_messages) { | 274 const std::map<std::string, std::string>& l10n_messages) { |
273 ExtensionProcessBindings::SetL10nMessages(extension_id, l10n_messages); | 275 ExtensionProcessBindings::SetL10nMessages(extension_id, l10n_messages); |
274 } | 276 } |
275 | 277 |
276 void RenderThread::OnControlMessageReceived(const IPC::Message& msg) { | 278 void RenderThread::OnControlMessageReceived(const IPC::Message& msg) { |
277 // App cache messages are handled by a delegate. | 279 // App cache messages are handled by a delegate. |
278 if (appcache_dispatcher_->OnMessageReceived(msg)) | 280 if (appcache_dispatcher_->OnMessageReceived(msg)) |
279 return; | 281 return; |
| 282 if (socket_stream_dispatcher_->OnMessageReceived(msg)) |
| 283 return; |
280 | 284 |
281 IPC_BEGIN_MESSAGE_MAP(RenderThread, msg) | 285 IPC_BEGIN_MESSAGE_MAP(RenderThread, msg) |
282 IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_NewTable, OnUpdateVisitedLinks) | 286 IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_NewTable, OnUpdateVisitedLinks) |
283 IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_Add, OnAddVisitedLinks) | 287 IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_Add, OnAddVisitedLinks) |
284 IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_Reset, OnResetVisitedLinks) | 288 IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_Reset, OnResetVisitedLinks) |
285 IPC_MESSAGE_HANDLER(ViewMsg_SetNextPageID, OnSetNextPageID) | 289 IPC_MESSAGE_HANDLER(ViewMsg_SetNextPageID, OnSetNextPageID) |
286 IPC_MESSAGE_HANDLER(ViewMsg_SetCSSColors, OnSetCSSColors) | 290 IPC_MESSAGE_HANDLER(ViewMsg_SetCSSColors, OnSetCSSColors) |
287 // TODO(port): removed from render_messages_internal.h; | 291 // TODO(port): removed from render_messages_internal.h; |
288 // is there a new non-windows message I should add here? | 292 // is there a new non-windows message I should add here? |
289 IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView) | 293 IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView) |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 void RenderThread::OnPurgePluginListCache(bool reload_pages) { | 591 void RenderThread::OnPurgePluginListCache(bool reload_pages) { |
588 EnsureWebKitInitialized(); | 592 EnsureWebKitInitialized(); |
589 // The call below will cause a GetPlugins call with refresh=true, but at this | 593 // The call below will cause a GetPlugins call with refresh=true, but at this |
590 // point we already know that the browser has refreshed its list, so disable | 594 // point we already know that the browser has refreshed its list, so disable |
591 // refresh temporarily to prevent each renderer process causing the list to be | 595 // refresh temporarily to prevent each renderer process causing the list to be |
592 // regenerated. | 596 // regenerated. |
593 plugin_refresh_allowed_ = false; | 597 plugin_refresh_allowed_ = false; |
594 WebKit::resetPluginCache(reload_pages); | 598 WebKit::resetPluginCache(reload_pages); |
595 plugin_refresh_allowed_ = true; | 599 plugin_refresh_allowed_ = true; |
596 } | 600 } |
OLD | NEW |