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

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

Issue 8991001: base::Bind: Convert most of webkit/appcache. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clang fix. Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <list> 10 #include <list>
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 247
248 struct PendingCreateStream { 248 struct PendingCreateStream {
249 PendingCreateStream(const GURL& url, RequestPriority priority, 249 PendingCreateStream(const GURL& url, RequestPriority priority,
250 scoped_refptr<SpdyStream>* spdy_stream, 250 scoped_refptr<SpdyStream>* spdy_stream,
251 const BoundNetLog& stream_net_log, 251 const BoundNetLog& stream_net_log,
252 const CompletionCallback& callback) 252 const CompletionCallback& callback)
253 : url(&url), 253 : url(&url),
254 priority(priority), 254 priority(priority),
255 spdy_stream(spdy_stream), 255 spdy_stream(spdy_stream),
256 stream_net_log(&stream_net_log), 256 stream_net_log(&stream_net_log),
257 callback(callback) { } 257 callback(callback) {}
258
259 ~PendingCreateStream();
258 260
259 const GURL* url; 261 const GURL* url;
260 RequestPriority priority; 262 RequestPriority priority;
261 scoped_refptr<SpdyStream>* spdy_stream; 263 scoped_refptr<SpdyStream>* spdy_stream;
262 const BoundNetLog* stream_net_log; 264 const BoundNetLog* stream_net_log;
263 CompletionCallback callback; 265 CompletionCallback callback;
264 }; 266 };
265 typedef std::queue<PendingCreateStream, std::list< PendingCreateStream> > 267 typedef std::queue<PendingCreateStream, std::list< PendingCreateStream> >
266 PendingCreateStreamQueue; 268 PendingCreateStreamQueue;
267 typedef std::map<int, scoped_refptr<SpdyStream> > ActiveStreamMap; 269 typedef std::map<int, scoped_refptr<SpdyStream> > ActiveStreamMap;
268 // Only HTTP push a stream. 270 // Only HTTP push a stream.
269 typedef std::map<std::string, scoped_refptr<SpdyStream> > PushedStreamMap; 271 typedef std::map<std::string, scoped_refptr<SpdyStream> > PushedStreamMap;
270 typedef std::priority_queue<SpdyIOBuffer> OutputQueue; 272 typedef std::priority_queue<SpdyIOBuffer> OutputQueue;
271 273
272 struct CallbackResultPair { 274 struct CallbackResultPair {
273 CallbackResultPair() : result(OK) {} 275 CallbackResultPair() : result(OK) {}
274 CallbackResultPair(const CompletionCallback& callback_in, int result_in) 276 CallbackResultPair(const CompletionCallback& callback_in, int result_in)
275 : callback(callback_in), result(result_in) {} 277 : callback(callback_in), result(result_in) {}
278 ~CallbackResultPair();
276 279
277 CompletionCallback callback; 280 CompletionCallback callback;
278 int result; 281 int result;
279 }; 282 };
280 283
281 typedef std::map<const scoped_refptr<SpdyStream>*, CallbackResultPair> 284 typedef std::map<const scoped_refptr<SpdyStream>*, CallbackResultPair>
282 PendingCallbackMap; 285 PendingCallbackMap;
283 286
284 enum State { 287 enum State {
285 IDLE, 288 IDLE,
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 const spdy::SpdyControlFlags flags_; 627 const spdy::SpdyControlFlags flags_;
625 const spdy::SpdyStreamId id_; 628 const spdy::SpdyStreamId id_;
626 const spdy::SpdyStreamId associated_stream_; 629 const spdy::SpdyStreamId associated_stream_;
627 630
628 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynParameter); 631 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynParameter);
629 }; 632 };
630 633
631 } // namespace net 634 } // namespace net
632 635
633 #endif // NET_SPDY_SPDY_SESSION_H_ 636 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698