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

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

Issue 301573002: Fix WeakPtrFactory member order in net/spdy and net/dns (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | 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 <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 // Merge the given headers into |response_headers_| and calls 481 // Merge the given headers into |response_headers_| and calls
482 // OnResponseHeadersUpdated() on the delegate (if attached). 482 // OnResponseHeadersUpdated() on the delegate (if attached).
483 // Returns a status code; if it is an error, the stream was closed 483 // Returns a status code; if it is an error, the stream was closed
484 // by this function. 484 // by this function.
485 int MergeWithResponseHeaders(const SpdyHeaderBlock& new_response_headers); 485 int MergeWithResponseHeaders(const SpdyHeaderBlock& new_response_headers);
486 486
487 static std::string DescribeState(State state); 487 static std::string DescribeState(State state);
488 488
489 const SpdyStreamType type_; 489 const SpdyStreamType type_;
490 490
491 base::WeakPtrFactory<SpdyStream> weak_ptr_factory_;
492
493 SpdyStreamId stream_id_; 491 SpdyStreamId stream_id_;
494 const GURL url_; 492 const GURL url_;
495 const RequestPriority priority_; 493 const RequestPriority priority_;
496 494
497 // Flow control variables. 495 // Flow control variables.
498 bool send_stalled_by_flow_control_; 496 bool send_stalled_by_flow_control_;
499 int32 send_window_size_; 497 int32 send_window_size_;
500 int32 recv_window_size_; 498 int32 recv_window_size_;
501 int32 unacked_recv_window_bytes_; 499 int32 unacked_recv_window_bytes_;
502 500
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 553
556 std::string domain_bound_private_key_; 554 std::string domain_bound_private_key_;
557 std::string domain_bound_cert_; 555 std::string domain_bound_cert_;
558 ServerBoundCertService::RequestHandle domain_bound_cert_request_handle_; 556 ServerBoundCertService::RequestHandle domain_bound_cert_request_handle_;
559 557
560 // Guards calls of delegate write handlers ensuring |this| is not destroyed. 558 // Guards calls of delegate write handlers ensuring |this| is not destroyed.
561 // TODO(jgraettinger): Consider removing after crbug.com/35511 is tracked 559 // TODO(jgraettinger): Consider removing after crbug.com/35511 is tracked
562 // down. 560 // down.
563 bool write_handler_guard_; 561 bool write_handler_guard_;
564 562
563 base::WeakPtrFactory<SpdyStream> weak_ptr_factory_;
564
565 DISALLOW_COPY_AND_ASSIGN(SpdyStream); 565 DISALLOW_COPY_AND_ASSIGN(SpdyStream);
566 }; 566 };
567 567
568 } // namespace net 568 } // namespace net
569 569
570 #endif // NET_SPDY_SPDY_STREAM_H_ 570 #endif // NET_SPDY_SPDY_STREAM_H_
OLDNEW
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/spdy/spdy_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698