[SPDY] Replace SpdyIOBuffer with new SpdyBuffer class

net/spdy/spdy_io_buffer.h

Index: net/spdy/spdy_io_buffer.h
diff --git a/net/spdy/spdy_io_buffer.h b/net/spdy/spdy_io_buffer.h
deleted file mode 100644
index ed95e70a524dcc6d79197aa61a5676d36791f1aa..0000000000000000000000000000000000000000
--- a/net/spdy/spdy_io_buffer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef NET_SPDY_SPDY_IO_BUFFER_H_
-#define NET_SPDY_SPDY_IO_BUFFER_H_
-
-#include "base/memory/ref_counted.h"
-#include "net/base/io_buffer.h"
-#include "net/base/net_export.h"
-
-namespace net {
-
-class SpdyStream;
-
-// A class for managing SPDY write buffers.  These write buffers need
-// to track the SpdyStream which they are associated with so that the
-// session can activate the stream lazily and also notify the stream
-// on completion of the write.
-class NET_EXPORT_PRIVATE SpdyIOBuffer {
- public:
-  SpdyIOBuffer();
-
-  // Constructor
-  // |buffer| is the actual data buffer.
-  // |size| is the size of the data buffer.
-  // |stream| is a pointer to the stream which is managing this buffer
-  // (can be NULL if the write is for the session itself).
-  SpdyIOBuffer(IOBuffer* buffer, int size, SpdyStream* stream);
-
-  // Declare this instead of using the default so that we avoid needing to
-  // include spdy_stream.h.
-  SpdyIOBuffer(const SpdyIOBuffer& rhs);
-
-  ~SpdyIOBuffer();
-
-  // Declare this instead of using the default so that we avoid needing to
-  // include spdy_stream.h.
-  SpdyIOBuffer& operator=(const SpdyIOBuffer& rhs);
-
-  void Swap(SpdyIOBuffer* other);
-
-  void Release();
-
-  // Accessors.
-  DrainableIOBuffer* buffer() const { return buffer_; }
-  const scoped_refptr<SpdyStream>& stream() const { return stream_; }

[Ryan Hamilton, 2013/04/16 18:44:25]

Interesting.  Because this class keeps around a ref_ptr to the stream, we ensure
that the stream is not destroyed until the buffer is destroyed (and probably
consumed).

[akalin, 2013/04/16 23:01:46]

Yeah. I think it's better to move the stream out to be a member of SpdySession,
though. For example, we should really clear the in-flight write and its stream
if we delete the stream, but we don't (and it's not obvious because it's hidden
in this class).

[akalin, 2013/04/16 23:48:15]

Actually, per our discussion about GetIOBufferForRemainingData(), we need to
clear the in-flight stream but *not* the SpdyBuffer object itself. Tricky!

-
- private:
-  scoped_refptr<DrainableIOBuffer> buffer_;
-  scoped_refptr<SpdyStream> stream_;
-};
-
-}  // namespace net
-
-#endif  // NET_SPDY_SPDY_IO_BUFFER_H_