summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_session.h
diff options
context:
space:
mode:
authorn.bansal@samsung.com <n.bansal@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 20:55:18 +0000
committern.bansal@samsung.com <n.bansal@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 20:55:18 +0000
commit0a30cf516cbb1b3888e3bcc1397548528c00c1b7 (patch)
tree93b5259bcdd3956595663f17c6f34b14eba7c103 /net/spdy/spdy_session.h
parent27e528323c1868255779f98e019e71920cf9fef2 (diff)
downloadchromium_src-0a30cf516cbb1b3888e3bcc1397548528c00c1b7.zip
chromium_src-0a30cf516cbb1b3888e3bcc1397548528c00c1b7.tar.gz
chromium_src-0a30cf516cbb1b3888e3bcc1397548528c00c1b7.tar.bz2
Fix WeakPtrFactory member order
Fix WeakPtrFactory member order in net/spdy/ & net/dns/ BUG=303818 Review URL: https://codereview.chromium.org/301573002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.h')
-rw-r--r--net/spdy/spdy_session.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 51ed3f2..9e2d064 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -180,7 +180,6 @@ class NET_EXPORT_PRIVATE SpdyStreamRequest {
void Reset();
- base::WeakPtrFactory<SpdyStreamRequest> weak_ptr_factory_;
SpdyStreamType type_;
base::WeakPtr<SpdySession> session_;
base::WeakPtr<SpdyStream> stream_;
@@ -189,6 +188,8 @@ class NET_EXPORT_PRIVATE SpdyStreamRequest {
BoundNetLog net_log_;
CompletionCallback callback_;
+ base::WeakPtrFactory<SpdyStreamRequest> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(SpdyStreamRequest);
};
@@ -931,12 +932,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
// or NULL, if the transport is not SSL.
SSLClientSocket* GetSSLClientSocket() const;
- // Used for posting asynchronous IO tasks. We use this even though
- // SpdySession is refcounted because we don't need to keep the SpdySession
- // alive if the last reference is within a RunnableMethod. Just revoke the
- // method.
- base::WeakPtrFactory<SpdySession> weak_factory_;
-
// Whether Do{Read,Write}Loop() is in the call stack. Useful for
// making sure we don't destroy ourselves prematurely in that case.
bool in_io_loop_;
@@ -1132,6 +1127,12 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
HostPortPair trusted_spdy_proxy_;
TimeFunc time_func_;
+
+ // Used for posting asynchronous IO tasks. We use this even though
+ // SpdySession is refcounted because we don't need to keep the SpdySession
+ // alive if the last reference is within a RunnableMethod. Just revoke the
+ // method.
+ base::WeakPtrFactory<SpdySession> weak_factory_;
};
} // namespace net