Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 681d3e971f586cfb59c50a3afed301d788ea4387..fc0c6a73b2a23692eea43f7241a7f21ebb9c77d6 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -38,6 +38,7 @@ |
| #include "content/common/pepper_plugin_registry.h" |
| #include "content/common/quota_dispatcher.h" |
| #include "content/common/request_extra_data.h" |
| +#include "content/common/socket_stream_handle_data.h" |
| #include "content/common/view_messages.h" |
| #include "content/public/common/bindings_policy.h" |
| #include "content/public/common/content_client.h" |
| @@ -141,6 +142,7 @@ |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStreamHandle.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" |
| @@ -163,6 +165,7 @@ |
| #include "webkit/glue/webdropdata.h" |
| #include "webkit/glue/webkit_constants.h" |
| #include "webkit/glue/webkit_glue.h" |
| +#include "webkit/glue/websocketstreamhandle_impl.h" |
| #include "webkit/glue/weburlloader_impl.h" |
| #include "webkit/glue/weburlresponse_extradata_impl.h" |
| #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
| @@ -243,6 +246,7 @@ using WebKit::WebSecurityPolicy; |
| using WebKit::WebSettings; |
| using WebKit::WebSharedWorker; |
| using WebKit::WebSize; |
| +using WebKit::WebSocketStreamHandle; |
| using WebKit::WebStorageNamespace; |
| using WebKit::WebStorageQuotaCallbacks; |
| using WebKit::WebStorageQuotaError; |
| @@ -274,6 +278,7 @@ using webkit::forms::PasswordForm; |
| using webkit::forms::PasswordFormDomManager; |
| using webkit_glue::AltErrorPageResourceFetcher; |
| using webkit_glue::ResourceFetcher; |
| +using webkit_glue::WebSocketStreamHandleImpl; |
| using webkit_glue::WebURLResponseExtraDataImpl; |
| //----------------------------------------------------------------------------- |
| @@ -3398,6 +3403,14 @@ void RenderViewImpl::dispatchIntent( |
| routing_id_, intent_data, id)); |
| } |
| +void RenderViewImpl::willOpenSocketStream( |
| + WebSocketStreamHandle* handle) { |
| + WebSocketStreamHandleImpl* impl = |
|
darin (slow to review)
2012/03/20 06:46:59
this could either be:
SocketStreamHandleData::A
Takashi Toyoshima
2012/03/20 18:19:40
I try the second approach at Patch Set 10.
And the
|
| + static_cast<WebSocketStreamHandleImpl*>(handle); |
| + if (impl) |
| + impl->SetUserData(handle, new SocketStreamHandleData(routing_id_)); |
| +} |
| + |
| // WebKit::WebPageSerializerClient implementation ------------------------------ |
| void RenderViewImpl::didSerializeDataForFrame( |