| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 #ifndef NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_ | 5 #ifndef NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_ |
| 6 #define NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_ | 6 #define NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_ |
| 7 | 7 |
| 8 #include "net/base/net_export.h" | 8 #include "net/base/net_export.h" |
| 9 #include "net/quic/quic_protocol.h" | 9 #include "net/quic/quic_protocol.h" |
| 10 #include "net/spdy/write_blocked_list.h" | 10 #include "net/spdy/write_blocked_list.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } else if (headers_stream_blocked_) { | 50 } else if (headers_stream_blocked_) { |
| 51 headers_stream_blocked_ = false; | 51 headers_stream_blocked_ = false; |
| 52 return kHeadersStreamId; | 52 return kHeadersStreamId; |
| 53 } else { | 53 } else { |
| 54 SpdyPriority priority = | 54 SpdyPriority priority = |
| 55 base_write_blocked_list_.GetHighestPriorityWriteBlockedList(); | 55 base_write_blocked_list_.GetHighestPriorityWriteBlockedList(); |
| 56 return base_write_blocked_list_.PopFront(priority); | 56 return base_write_blocked_list_.PopFront(priority); |
| 57 } | 57 } |
| 58 } | 58 } |
| 59 | 59 |
| 60 // TODO(avd) Remove version argument when QUIC_VERSION_12 is deprecated. | 60 void PushBack(QuicStreamId stream_id, QuicPriority priority) { |
| 61 void PushBack(QuicStreamId stream_id, | |
| 62 QuicPriority priority, | |
| 63 QuicVersion version) { | |
| 64 if (stream_id == kCryptoStreamId) { | 61 if (stream_id == kCryptoStreamId) { |
| 65 DCHECK_EQ(kHighestPriority, priority); | 62 DCHECK_EQ(kHighestPriority, priority); |
| 66 // TODO(avd) Add DCHECK(!crypto_stream_blocked_) | 63 // TODO(avd) Add DCHECK(!crypto_stream_blocked_) |
| 67 crypto_stream_blocked_ = true; | 64 crypto_stream_blocked_ = true; |
| 68 } else if (version > QUIC_VERSION_12 && | 65 } else if (stream_id == kHeadersStreamId) { |
| 69 stream_id == kHeadersStreamId) { | |
| 70 DCHECK_EQ(kHighestPriority, priority); | 66 DCHECK_EQ(kHighestPriority, priority); |
| 71 // TODO(avd) Add DCHECK(!headers_stream_blocked_); | 67 // TODO(avd) Add DCHECK(!headers_stream_blocked_); |
| 72 headers_stream_blocked_ = true; | 68 headers_stream_blocked_ = true; |
| 73 } else { | 69 } else { |
| 74 base_write_blocked_list_.PushBack( | 70 base_write_blocked_list_.PushBack( |
| 75 stream_id, static_cast<SpdyPriority>(priority)); | 71 stream_id, static_cast<SpdyPriority>(priority)); |
| 76 } | 72 } |
| 77 } | 73 } |
| 78 | 74 |
| 79 private: | 75 private: |
| 80 QuicWriteBlockedListBase base_write_blocked_list_; | 76 QuicWriteBlockedListBase base_write_blocked_list_; |
| 81 bool crypto_stream_blocked_; | 77 bool crypto_stream_blocked_; |
| 82 bool headers_stream_blocked_; | 78 bool headers_stream_blocked_; |
| 83 | 79 |
| 84 DISALLOW_COPY_AND_ASSIGN(QuicWriteBlockedList); | 80 DISALLOW_COPY_AND_ASSIGN(QuicWriteBlockedList); |
| 85 }; | 81 }; |
| 86 | 82 |
| 87 } // namespace net | 83 } // namespace net |
| 88 | 84 |
| 89 | 85 |
| 90 #endif // NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_ | 86 #endif // NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_ |
| OLD | NEW |