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

Unified Diff: net/spdy/spdy_session.h

Issue 2526003002: Disallow multiple HEADERS frames on pushed streams. (Closed)
Patch Set: Rename enum, enum entry, and member. Created 4 years, 1 month 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 | « net/spdy/spdy_proxy_client_socket.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.h
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index b7066bc8c0bddf1112a68a314fe93506ab718317..755a1ef187528cac48b60fedaf0c7f9f3c4bece1 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -614,19 +614,9 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
ServerPushValidCrossOriginWithOpenSession);
- typedef std::deque<base::WeakPtr<SpdyStreamRequest> >
+ typedef std::deque<base::WeakPtr<SpdyStreamRequest>>
PendingStreamRequestQueue;
-
- struct ActiveStreamInfo {
- ActiveStreamInfo();
- explicit ActiveStreamInfo(SpdyStream* stream);
- ~ActiveStreamInfo();
-
- SpdyStream* stream;
- bool waiting_for_reply_headers_frame;
- };
- typedef std::map<SpdyStreamId, ActiveStreamInfo> ActiveStreamMap;
-
+ typedef std::map<SpdyStreamId, SpdyStream*> ActiveStreamMap;
typedef std::set<SpdyStream*> CreatedStreamSet;
enum AvailabilityState {
@@ -682,7 +672,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
// possible.
void ProcessPendingStreamRequests();
- bool TryCreatePushStream(SpdyStreamId stream_id,
+ void TryCreatePushStream(SpdyStreamId stream_id,
SpdyStreamId associated_stream_id,
SpdyPriority priority,
SpdyHeaderBlock headers);
@@ -825,14 +815,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
// list). Returns NULL otherwise.
base::WeakPtr<SpdyStream> GetActivePushStream(const GURL& url);
- // Delegates to |stream->OnInitialResponseHeadersReceived()|. If an
- // error is returned, the last reference to |this| may have been
- // released.
- int OnInitialResponseHeadersReceived(const SpdyHeaderBlock& response_headers,
- base::Time response_time,
- base::TimeTicks recv_first_byte_time,
- SpdyStream* stream);
-
void RecordPingRTTHistogram(base::TimeDelta duration);
void RecordHistograms();
void RecordProtocolErrorHistogram(SpdyProtocolErrorDetails details);
« no previous file with comments | « net/spdy/spdy_proxy_client_socket.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698