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

Side by Side Diff: net/spdy/spdy_stream.h

Issue 1459973003: Remove ScopedVector from spdy_stream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | net/spdy/spdy_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SPDY_SPDY_STREAM_H_ 5 #ifndef NET_SPDY_SPDY_STREAM_H_
6 #define NET_SPDY_SPDY_STREAM_H_ 6 #define NET_SPDY_SPDY_STREAM_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <deque> 10 #include <deque>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/scoped_vector.h"
18 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
19 #include "net/base/io_buffer.h" 18 #include "net/base/io_buffer.h"
20 #include "net/base/net_export.h" 19 #include "net/base/net_export.h"
21 #include "net/base/request_priority.h" 20 #include "net/base/request_priority.h"
22 #include "net/log/net_log.h" 21 #include "net/log/net_log.h"
23 #include "net/socket/ssl_client_socket.h" 22 #include "net/socket/ssl_client_socket.h"
24 #include "net/spdy/spdy_buffer.h" 23 #include "net/spdy/spdy_buffer.h"
25 #include "net/spdy/spdy_framer.h" 24 #include "net/spdy/spdy_framer.h"
26 #include "net/spdy/spdy_header_block.h" 25 #include "net/spdy/spdy_header_block.h"
27 #include "net/spdy/spdy_protocol.h" 26 #include "net/spdy/spdy_protocol.h"
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 539
541 // Data waiting to be sent, and the close state of the local endpoint 540 // Data waiting to be sent, and the close state of the local endpoint
542 // after the data is fully written. 541 // after the data is fully written.
543 scoped_refptr<DrainableIOBuffer> pending_send_data_; 542 scoped_refptr<DrainableIOBuffer> pending_send_data_;
544 SpdySendStatus pending_send_status_; 543 SpdySendStatus pending_send_status_;
545 544
546 // Data waiting to be received, and the close state of the remote endpoint 545 // Data waiting to be received, and the close state of the remote endpoint
547 // after the data is fully read. Specifically, data received before the 546 // after the data is fully read. Specifically, data received before the
548 // delegate is attached must be buffered and later replayed. A remote FIN 547 // delegate is attached must be buffered and later replayed. A remote FIN
549 // is represented by a final, zero-length buffer. 548 // is represented by a final, zero-length buffer.
550 ScopedVector<SpdyBuffer> pending_recv_data_; 549 std::vector<scoped_ptr<SpdyBuffer>> pending_recv_data_;
551 550
552 // The time at which the request was made that resulted in this response. 551 // The time at which the request was made that resulted in this response.
553 // For cached responses, this time could be "far" in the past. 552 // For cached responses, this time could be "far" in the past.
554 base::Time request_time_; 553 base::Time request_time_;
555 554
556 SpdyHeaderBlock response_headers_; 555 SpdyHeaderBlock response_headers_;
557 SpdyResponseHeadersStatus response_headers_status_; 556 SpdyResponseHeadersStatus response_headers_status_;
558 base::Time response_time_; 557 base::Time response_time_;
559 558
560 State io_state_; 559 State io_state_;
(...skipping 26 matching lines...) Expand all
587 bool write_handler_guard_; 586 bool write_handler_guard_;
588 587
589 base::WeakPtrFactory<SpdyStream> weak_ptr_factory_; 588 base::WeakPtrFactory<SpdyStream> weak_ptr_factory_;
590 589
591 DISALLOW_COPY_AND_ASSIGN(SpdyStream); 590 DISALLOW_COPY_AND_ASSIGN(SpdyStream);
592 }; 591 };
593 592
594 } // namespace net 593 } // namespace net
595 594
596 #endif // NET_SPDY_SPDY_STREAM_H_ 595 #endif // NET_SPDY_SPDY_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | net/spdy/spdy_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698