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

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

Issue 12212101: Revert 181626 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/spdy/spdy_session.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_SESSION_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_H_
6 #define NET_SPDY_SPDY_SESSION_H_ 6 #define NET_SPDY_SPDY_SESSION_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 // |spdy_session_pool_| owns us, therefore its lifetime must exceed ours. We 618 // |spdy_session_pool_| owns us, therefore its lifetime must exceed ours. We
619 // set this to NULL after we are removed from the pool. 619 // set this to NULL after we are removed from the pool.
620 SpdySessionPool* spdy_session_pool_; 620 SpdySessionPool* spdy_session_pool_;
621 HttpServerProperties* const http_server_properties_; 621 HttpServerProperties* const http_server_properties_;
622 622
623 // The socket handle for this session. 623 // The socket handle for this session.
624 scoped_ptr<ClientSocketHandle> connection_; 624 scoped_ptr<ClientSocketHandle> connection_;
625 625
626 // The read buffer used to read data from the socket. 626 // The read buffer used to read data from the socket.
627 scoped_refptr<IOBuffer> read_buffer_; 627 scoped_refptr<IOBuffer> read_buffer_;
628 bool read_pending_;
628 629
629 int stream_hi_water_mark_; // The next stream id to use. 630 int stream_hi_water_mark_; // The next stream id to use.
630 631
631 // Queue, for each priority, of pending Create Streams that have not 632 // Queue, for each priority, of pending Create Streams that have not
632 // yet been satisfied 633 // yet been satisfied
633 PendingCreateStreamQueue pending_create_stream_queues_[NUM_PRIORITIES]; 634 PendingCreateStreamQueue pending_create_stream_queues_[NUM_PRIORITIES];
634 635
635 // Map from stream id to all active streams. Streams are active in the sense 636 // Map from stream id to all active streams. Streams are active in the sense
636 // that they have a consumer (typically SpdyNetworkTransaction and regardless 637 // that they have a consumer (typically SpdyNetworkTransaction and regardless
637 // of whether or not there is currently any ongoing IO [might be waiting for 638 // of whether or not there is currently any ongoing IO [might be waiting for
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 // This SPDY proxy is allowed to push resources from origins that are 773 // This SPDY proxy is allowed to push resources from origins that are
773 // different from those of their associated streams. 774 // different from those of their associated streams.
774 HostPortPair trusted_spdy_proxy_; 775 HostPortPair trusted_spdy_proxy_;
775 776
776 TimeFunc time_func_; 777 TimeFunc time_func_;
777 }; 778 };
778 779
779 } // namespace net 780 } // namespace net
780 781
781 #endif // NET_SPDY_SPDY_SESSION_H_ 782 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698