Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1658)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 308513004: Pass render frame ID to WebSocketBridge (Chromium side) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 7c8317ace76e46f4aaf6a43188d610f0d4bb2c7c..3be61d1d4c5372db8ed43d783fa14380af47698f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -26,6 +26,7 @@
#include "content/child/service_worker/web_service_worker_provider_impl.h"
#include "content/child/web_socket_stream_handle_impl.h"
#include "content/child/webmessageportchannel_impl.h"
+#include "content/child/websocket_bridge.h"
#include "content/common/clipboard_messages.h"
#include "content/common/frame_messages.h"
#include "content/common/input_messages.h"
@@ -2741,6 +2742,11 @@ void RenderFrameImpl::willOpenSocketStream(
impl->SetUserData(handle, new SocketStreamHandleData(routing_id_));
}
+void RenderFrameImpl::willOpenWebSocket(blink::WebSocketHandle* handle) {
+ WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle);
+ impl->set_render_frame_id(routing_id_);
+}
+
blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() {
return render_view_->geolocationClient();
}
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698