summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_thread.cc
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 06:18:11 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 06:18:11 +0000
commit327344ef227af4c66b42cb7e948d4c4096eab83f (patch)
treee66b340b198dcd9ed8db57ae067eb9fd8d11c26b /chrome/renderer/render_thread.cc
parent50220030753d7d0ba1fcea95e5f889033bdeb382 (diff)
downloadchromium_src-327344ef227af4c66b42cb7e948d4c4096eab83f.zip
chromium_src-327344ef227af4c66b42cb7e948d4c4096eab83f.tar.gz
chromium_src-327344ef227af4c66b42cb7e948d4c4096eab83f.tar.bz2
WebSocket support in chromium.
Run with --enable-web-sockets enables WebSocket features. BUG=12497 TEST=none Review URL: http://codereview.chromium.org/292044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread.cc')
-rw-r--r--chrome/renderer/render_thread.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 998a2fa..33702fc 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -44,6 +44,7 @@
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/renderer_webkitclient_impl.h"
#include "chrome/renderer/renderer_web_database_observer.h"
+#include "chrome/renderer/socket_stream_dispatcher.h"
#include "chrome/renderer/user_script_slave.h"
#include "ipc/ipc_message.h"
#include "webkit/api/public/WebCache.h"
@@ -139,6 +140,7 @@ void RenderThread::Init() {
dns_master_.reset(new RenderDnsMaster());
histogram_snapshots_.reset(new RendererHistogramSnapshots());
appcache_dispatcher_.reset(new AppCacheDispatcher(this));
+ socket_stream_dispatcher_.reset(new SocketStreamDispatcher());
devtools_agent_filter_ = new DevToolsAgentFilter();
AddFilter(devtools_agent_filter_.get());
db_message_filter_ = new DBMessageFilter();
@@ -277,6 +279,8 @@ void RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
// App cache messages are handled by a delegate.
if (appcache_dispatcher_->OnMessageReceived(msg))
return;
+ if (socket_stream_dispatcher_->OnMessageReceived(msg))
+ return;
IPC_BEGIN_MESSAGE_MAP(RenderThread, msg)
IPC_MESSAGE_HANDLER(ViewMsg_VisitedLink_NewTable, OnUpdateVisitedLinks)