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

Unified Diff: net/spdy/spdy_stream.h

Issue 2852029: Revert "Streams send a Rst frame upon being closed by client. Some minor editorial fixes." (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 6 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 | « net/spdy/spdy_session.cc ('k') | net/spdy/spdy_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_stream.h
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 88b3e04ff193dfab4f81bf42f552d366126df996..6183be20d097913bc7d005c4343c1adb89a3dc83 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -109,7 +109,8 @@ class SpdyStream : public base::RefCounted<SpdyStream> {
void SetRequestTime(base::Time t);
// Called by the SpdySession when a response (e.g. a SYN_REPLY) has been
- // received for this stream.
+ // received for this stream. |path| is the path of the URL for a server
+ // initiated stream, otherwise is empty.
// Returns a status code.
int OnResponseReceived(const spdy::SpdyHeaderBlock& response);
@@ -119,7 +120,7 @@ class SpdyStream : public base::RefCounted<SpdyStream> {
// |buffer| contains the data received. The stream must copy any data
// from this buffer before returning from this callback.
// |length| is the number of bytes received or an error.
- // A length of zero indicates end-of-stream.
+ // A zero-length count does not indicate end-of-stream.
void OnDataReceived(const char* buffer, int bytes);
// Called by the SpdySession when a write has completed. This callback
@@ -159,20 +160,6 @@ class SpdyStream : public base::RefCounted<SpdyStream> {
bool response_complete() const { return response_complete_; }
int response_status() const { return response_status_; }
- // If this function returns true, then the spdy_session is guaranteeing that
- // this spdy_stream has been removed from active_streams.
- bool half_closed_client_side() const { return half_closed_client_side_; }
-
- bool half_closed_server_side() const { return half_closed_server_side_; }
- bool half_closed_both_sides() const {
- return half_closed_client_side_ && half_closed_server_side_;
- }
-
- // These two functions should only ever be called by spdy_session, and should
- // only be called once.
- void HalfCloseClientSide() { half_closed_client_side_ = true; }
- void HalfCloseServerSide() { half_closed_server_side_ = true; }
-
private:
enum State {
STATE_NONE,
@@ -248,8 +235,6 @@ class SpdyStream : public base::RefCounted<SpdyStream> {
bool histograms_recorded_;
// Data received before delegate is attached.
std::vector<scoped_refptr<IOBufferWithSize> > pending_buffers_;
- bool half_closed_client_side_;
- bool half_closed_server_side_;
DISALLOW_COPY_AND_ASSIGN(SpdyStream);
};
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/spdy/spdy_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698