content/renderer/render_view_impl.cc - Issue 9677031: Bind RenderViewImpl routing_id to SocketStreamHost

Unified Diff: content/renderer/render_view_impl.cc

Issue 9677031: Bind RenderViewImpl routing_id to SocketStreamHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/common/socket_stream_dispatcher.cc ('K') | « content/renderer/render_view_impl.h ('k') | content/renderer/websocketstreamhandle_impl_extradata_impl.h » ('j') | content/renderer/websocketstreamhandle_impl_extradata_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..24c3237566efd64f180446ddd76de4ab8df17780 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -89,6 +89,7 @@

#include "content/renderer/web_ui_bindings.h"

#include "content/renderer/webplugin_delegate_proxy.h"

#include "content/renderer/websharedworker_proxy.h"

+#include "content/renderer/websocketstreamhandle_impl_extradata_impl.h"

#include "media/base/filter_collection.h"

#include "media/base/media_switches.h"

#include "media/base/message_loop_factory.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,15 @@ void RenderViewImpl::dispatchIntent(

routing_id_, intent_data, id));

}

+void RenderViewImpl::willOpenSocketStream(

+ WebSocketStreamHandle* handle) {

+ WebSocketStreamHandleImpl* impl =

+ static_cast<WebSocketStreamHandleImpl*>(handle);

+ if (impl)

+ impl->setExtraData(

darin (slow to review) 2012/03/19 20:58:28 since this is all chromium-side, the more canonica

Takashi Toyoshima 2012/03/19 22:58:44 Done.

+ new WebSocketStreamHandleImplExtraDataImpl(routing_id_));

// WebKit::WebPageSerializerClient implementation ------------------------------

void RenderViewImpl::didSerializeDataForFrame(