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

Unified Diff: net/spdy/spdy_protocol.h

Issue 12262004: Remove SpdyRstStreamControlFrame struct. Useful for SPDY 4 development. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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_framer_test.cc ('k') | net/spdy/spdy_protocol_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_protocol.h
diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h
index dd7e7534ada60111009ffbe074061349ee672ed4..78f75b9c93ef7aa2364152127df5ac713db2815c 100644
--- a/net/spdy/spdy_protocol.h
+++ b/net/spdy/spdy_protocol.h
@@ -491,12 +491,6 @@ struct SpdySynStreamControlFrameBlock : SpdyFrameBlock {
uint8 credential_slot_;
};
-// A RST_STREAM Control Frame structure.
-struct SpdyRstStreamControlFrameBlock : SpdyFrameBlock {
- SpdyStreamId stream_id_;
- uint32 status_;
-};
-
// A SETTINGS Control Frame structure.
struct SpdySettingsControlFrameBlock : SpdyFrameBlock {
uint32 num_entries_;
@@ -1038,43 +1032,6 @@ class SpdySynStreamControlFrame : public SpdyControlFrame {
DISALLOW_COPY_AND_ASSIGN(SpdySynStreamControlFrame);
};
-// A RST_STREAM frame.
-class SpdyRstStreamControlFrame : public SpdyControlFrame {
- public:
- SpdyRstStreamControlFrame() : SpdyControlFrame(size()) {}
- SpdyRstStreamControlFrame(char* data, bool owns_buffer)
- : SpdyControlFrame(data, owns_buffer) {}
-
- SpdyStreamId stream_id() const {
- return ntohl(block()->stream_id_) & kStreamIdMask;
- }
-
- SpdyRstStreamStatus status() const {
- SpdyRstStreamStatus status =
- static_cast<SpdyRstStreamStatus>(ntohl(block()->status_));
- if (status < RST_STREAM_INVALID || status >= RST_STREAM_NUM_STATUS_CODES) {
- status = RST_STREAM_INVALID;
- }
- return status;
- }
- void set_status(SpdyRstStreamStatus status) {
- mutable_block()->status_ = htonl(static_cast<uint32>(status));
- }
-
- // Returns the size of the SpdyRstStreamControlFrameBlock structure.
- // Note: this is not the size of the SpdyRstStreamControlFrame class.
- static size_t size() { return sizeof(SpdyRstStreamControlFrameBlock); }
-
- private:
- const struct SpdyRstStreamControlFrameBlock* block() const {
- return static_cast<SpdyRstStreamControlFrameBlock*>(frame_);
- }
- struct SpdyRstStreamControlFrameBlock* mutable_block() {
- return static_cast<SpdyRstStreamControlFrameBlock*>(frame_);
- }
- DISALLOW_COPY_AND_ASSIGN(SpdyRstStreamControlFrame);
-};
-
class SpdySettingsControlFrame : public SpdyControlFrame {
public:
SpdySettingsControlFrame() : SpdyControlFrame(size()) {}
« no previous file with comments | « net/spdy/spdy_framer_test.cc ('k') | net/spdy/spdy_protocol_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698