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

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

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 const SSLInfo& ssl_info, 285 const SSLInfo& ssl_info,
286 const std::string& old_hostname, 286 const std::string& old_hostname,
287 const std::string& new_hostname); 287 const std::string& new_hostname);
288 288
289 // Create a new SpdySession. 289 // Create a new SpdySession.
290 // |spdy_session_key| is the host/port that this session connects to, privacy 290 // |spdy_session_key| is the host/port that this session connects to, privacy
291 // and proxy configuration settings that it's using. 291 // and proxy configuration settings that it's using.
292 // |session| is the HttpNetworkSession. |net_log| is the NetLog that we log 292 // |session| is the HttpNetworkSession. |net_log| is the NetLog that we log
293 // network events to. 293 // network events to.
294 SpdySession(const SpdySessionKey& spdy_session_key, 294 SpdySession(const SpdySessionKey& spdy_session_key,
295 const base::WeakPtr<HttpServerProperties>& http_server_properties, 295 HttpServerProperties* const http_server_properties,
asanka 2016/06/07 20:19:56 Const value arguments in a declarations are a no-o
Bence 2016/06/08 18:27:18 Done.
296 TransportSecurityState* transport_security_state, 296 TransportSecurityState* transport_security_state,
297 bool verify_domain_authentication, 297 bool verify_domain_authentication,
298 bool enable_sending_initial_data, 298 bool enable_sending_initial_data,
299 bool enable_ping_based_connection_checking, 299 bool enable_ping_based_connection_checking,
300 bool enable_priority_dependencies, 300 bool enable_priority_dependencies,
301 NextProto default_protocol, 301 NextProto default_protocol,
302 size_t session_max_recv_window_size, 302 size_t session_max_recv_window_size,
303 size_t stream_max_recv_window_size, 303 size_t stream_max_recv_window_size,
304 TimeFunc time_func, 304 TimeFunc time_func,
305 ProxyDelegate* proxy_delegate, 305 ProxyDelegate* proxy_delegate,
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 1019
1020 // The key used to identify this session. 1020 // The key used to identify this session.
1021 const SpdySessionKey spdy_session_key_; 1021 const SpdySessionKey spdy_session_key_;
1022 1022
1023 // Set set of SpdySessionKeys for which this session has serviced 1023 // Set set of SpdySessionKeys for which this session has serviced
1024 // requests. 1024 // requests.
1025 std::set<SpdySessionKey> pooled_aliases_; 1025 std::set<SpdySessionKey> pooled_aliases_;
1026 1026
1027 // |pool_| owns us, therefore its lifetime must exceed ours. 1027 // |pool_| owns us, therefore its lifetime must exceed ours.
1028 SpdySessionPool* pool_; 1028 SpdySessionPool* pool_;
1029 const base::WeakPtr<HttpServerProperties> http_server_properties_; 1029 HttpServerProperties* const http_server_properties_;
asanka 2016/06/07 20:19:56 Doesn't match surrounding code to mark just this p
Bence 2016/06/08 18:27:18 Done.
1030 1030
1031 TransportSecurityState* transport_security_state_; 1031 TransportSecurityState* transport_security_state_;
1032 1032
1033 // The socket handle for this session. 1033 // The socket handle for this session.
1034 std::unique_ptr<ClientSocketHandle> connection_; 1034 std::unique_ptr<ClientSocketHandle> connection_;
1035 1035
1036 // The read buffer used to read data from the socket. 1036 // The read buffer used to read data from the socket.
1037 scoped_refptr<IOBuffer> read_buffer_; 1037 scoped_refptr<IOBuffer> read_buffer_;
1038 1038
1039 SpdyStreamId stream_hi_water_mark_; // The next stream id to use. 1039 SpdyStreamId stream_hi_water_mark_; // The next stream id to use.
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 // Used for posting asynchronous IO tasks. We use this even though 1236 // Used for posting asynchronous IO tasks. We use this even though
1237 // SpdySession is refcounted because we don't need to keep the SpdySession 1237 // SpdySession is refcounted because we don't need to keep the SpdySession
1238 // alive if the last reference is within a RunnableMethod. Just revoke the 1238 // alive if the last reference is within a RunnableMethod. Just revoke the
1239 // method. 1239 // method.
1240 base::WeakPtrFactory<SpdySession> weak_factory_; 1240 base::WeakPtrFactory<SpdySession> weak_factory_;
1241 }; 1241 };
1242 1242
1243 } // namespace net 1243 } // namespace net
1244 1244
1245 #endif // NET_SPDY_SPDY_SESSION_H_ 1245 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698