| Index: net/spdy/spdy_write_queue.cc
|
| diff --git a/net/spdy/spdy_write_queue.cc b/net/spdy/spdy_write_queue.cc
|
| index 1d6937449c5d9bea39b88b6e5d122267d07c9e28..aabf8ccfb889e0cf7234cb159e4819f1f3c77e62 100644
|
| --- a/net/spdy/spdy_write_queue.cc
|
| +++ b/net/spdy/spdy_write_queue.cc
|
| @@ -13,7 +13,8 @@
|
|
|
| namespace net {
|
|
|
| -SpdyWriteQueue::PendingWrite::PendingWrite() : frame_producer(NULL) {}
|
| +SpdyWriteQueue::PendingWrite::PendingWrite() : frame_producer(NULL) {
|
| +}
|
|
|
| SpdyWriteQueue::PendingWrite::PendingWrite(
|
| SpdyFrameType frame_type,
|
| @@ -22,11 +23,14 @@ SpdyWriteQueue::PendingWrite::PendingWrite(
|
| : frame_type(frame_type),
|
| frame_producer(frame_producer),
|
| stream(stream),
|
| - has_stream(stream.get() != NULL) {}
|
| + has_stream(stream.get() != NULL) {
|
| +}
|
|
|
| -SpdyWriteQueue::PendingWrite::~PendingWrite() {}
|
| +SpdyWriteQueue::PendingWrite::~PendingWrite() {
|
| +}
|
|
|
| -SpdyWriteQueue::SpdyWriteQueue() : removing_writes_(false) {}
|
| +SpdyWriteQueue::SpdyWriteQueue() : removing_writes_(false) {
|
| +}
|
|
|
| SpdyWriteQueue::~SpdyWriteQueue() {
|
| Clear();
|
| @@ -87,7 +91,8 @@ void SpdyWriteQueue::RemovePendingWritesForStream(
|
| if (priority == i)
|
| continue;
|
| for (std::deque<PendingWrite>::const_iterator it = queue_[i].begin();
|
| - it != queue_[i].end(); ++it) {
|
| + it != queue_[i].end();
|
| + ++it) {
|
| DCHECK_NE(it->stream.get(), stream.get());
|
| }
|
| }
|
| @@ -97,7 +102,8 @@ void SpdyWriteQueue::RemovePendingWritesForStream(
|
| std::deque<PendingWrite>* queue = &queue_[priority];
|
| std::deque<PendingWrite>::iterator out_it = queue->begin();
|
| for (std::deque<PendingWrite>::const_iterator it = queue->begin();
|
| - it != queue->end(); ++it) {
|
| + it != queue->end();
|
| + ++it) {
|
| if (it->stream.get() == stream.get()) {
|
| delete it->frame_producer;
|
| } else {
|
| @@ -118,7 +124,8 @@ void SpdyWriteQueue::RemovePendingWritesForStreamsAfter(
|
| std::deque<PendingWrite>* queue = &queue_[i];
|
| std::deque<PendingWrite>::iterator out_it = queue->begin();
|
| for (std::deque<PendingWrite>::const_iterator it = queue->begin();
|
| - it != queue->end(); ++it) {
|
| + it != queue->end();
|
| + ++it) {
|
| if (it->stream.get() && (it->stream->stream_id() > last_good_stream_id ||
|
| it->stream->stream_id() == 0)) {
|
| delete it->frame_producer;
|
| @@ -137,7 +144,8 @@ void SpdyWriteQueue::Clear() {
|
| removing_writes_ = true;
|
| for (int i = MINIMUM_PRIORITY; i <= MAXIMUM_PRIORITY; ++i) {
|
| for (std::deque<PendingWrite>::iterator it = queue_[i].begin();
|
| - it != queue_[i].end(); ++it) {
|
| + it != queue_[i].end();
|
| + ++it) {
|
| delete it->frame_producer;
|
| }
|
| queue_[i].clear();
|
|
|