| Index: net/spdy/spdy_buffer.cc
|
| diff --git a/net/spdy/spdy_buffer.cc b/net/spdy/spdy_buffer.cc
|
| index fad3305d89493a5744498f29ce030e87eb981185..be783fc6a1a3616d86ff416769ef381254594268 100644
|
| --- a/net/spdy/spdy_buffer.cc
|
| +++ b/net/spdy/spdy_buffer.cc
|
| @@ -20,16 +20,17 @@ namespace {
|
| // Bound on largest frame any SPDY version has allowed.
|
| const size_t kMaxSpdyFrameSize = 0x00ffffff;
|
|
|
| -// Makes a SpdyFrame with |size| bytes of data copied from
|
| -// |data|. |data| must be non-NULL and |size| must be positive.
|
| -scoped_ptr<SpdyFrame> MakeSpdyFrame(const char* data, size_t size) {
|
| +// Makes a SpdySerializedFrame with |size| bytes of data copied from |data|.
|
| +// |data| must be non-NULL and |size| must be positive.
|
| +scoped_ptr<SpdySerializedFrame> MakeSpdySerializedFrame(const char* data,
|
| + size_t size) {
|
| DCHECK(data);
|
| CHECK_GT(size, 0u);
|
| CHECK_LE(size, kMaxSpdyFrameSize);
|
| scoped_ptr<char[]> frame_data(new char[size]);
|
| std::memcpy(frame_data.get(), data, size);
|
| - scoped_ptr<SpdyFrame> frame(
|
| - new SpdyFrame(frame_data.release(), size, true /* owns_buffer */));
|
| + scoped_ptr<SpdySerializedFrame> frame(new SpdySerializedFrame(
|
| + frame_data.release(), size, true /* owns_buffer */));
|
| return frame;
|
| }
|
|
|
| @@ -56,9 +57,8 @@ class SpdyBuffer::SharedFrameIOBuffer : public IOBuffer {
|
| DISALLOW_COPY_AND_ASSIGN(SharedFrameIOBuffer);
|
| };
|
|
|
| -SpdyBuffer::SpdyBuffer(scoped_ptr<SpdyFrame> frame)
|
| - : shared_frame_(new SharedFrame()),
|
| - offset_(0) {
|
| +SpdyBuffer::SpdyBuffer(scoped_ptr<SpdySerializedFrame> frame)
|
| + : shared_frame_(new SharedFrame()), offset_(0) {
|
| shared_frame_->data = std::move(frame);
|
| }
|
|
|
| @@ -69,7 +69,7 @@ SpdyBuffer::SpdyBuffer(const char* data, size_t size) :
|
| offset_(0) {
|
| CHECK_GT(size, 0u);
|
| CHECK_LE(size, kMaxSpdyFrameSize);
|
| - shared_frame_->data = MakeSpdyFrame(data, size);
|
| + shared_frame_->data = MakeSpdySerializedFrame(data, size);
|
| }
|
|
|
| SpdyBuffer::~SpdyBuffer() {
|
|
|