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

Unified Diff: content/browser/websockets/websocket_manager.cc

Issue 2397393002: Provide child/frame IDs for WebSocket handshake request (Closed)
Patch Set: fix Created 4 years, 2 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
Index: content/browser/websockets/websocket_manager.cc
diff --git a/content/browser/websockets/websocket_manager.cc b/content/browser/websockets/websocket_manager.cc
index bd0e372b091fb2502b57e2dc48a927a119c0b85b..6984564fda716b0ddd2eba4c14bdd4a65b8738bf 100644
--- a/content/browser/websockets/websocket_manager.cc
+++ b/content/browser/websockets/websocket_manager.cc
@@ -118,8 +118,8 @@ void WebSocketManager::DoCreateWebSocket(
// Keep all WebSocketImpls alive until either the client drops its
// connection (see OnLostConnectionToClient) or we need to shutdown.
- impls_.insert(CreateWebSocketImpl(this, std::move(request), frame_id,
- CalculateDelay()));
+ impls_.insert(CreateWebSocketImpl(this, std::move(request), process_id_,
+ frame_id, CalculateDelay()));
++num_pending_connections_;
if (!throttling_period_timer_.IsRunning()) {
@@ -161,9 +161,11 @@ void WebSocketManager::ThrottlingPeriodTimerCallback() {
WebSocketImpl* WebSocketManager::CreateWebSocketImpl(
WebSocketImpl::Delegate* delegate,
blink::mojom::WebSocketRequest request,
+ int child_id,
int frame_id,
base::TimeDelta delay) {
- return new WebSocketImpl(delegate, std::move(request), frame_id, delay);
+ return new WebSocketImpl(delegate, std::move(request), child_id, frame_id,
+ delay);
}
int WebSocketManager::GetClientProcessId() {
« no previous file with comments | « content/browser/websockets/websocket_manager.h ('k') | content/browser/websockets/websocket_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698