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

Side by Side Diff: content/renderer/media/remote_media_stream_impl.h

Issue 780713002: Fix remaining WeakPtrFactory ordering problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 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
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 CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 base::WeakPtr<RemoteMediaStreamImpl> media_stream_; 85 base::WeakPtr<RemoteMediaStreamImpl> media_stream_;
86 const scoped_refptr<base::SingleThreadTaskRunner> main_thread_; 86 const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
87 scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream_; 87 scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream_;
88 }; 88 };
89 89
90 void OnChanged(scoped_ptr<RemoteAudioTrackAdapters> audio_tracks, 90 void OnChanged(scoped_ptr<RemoteAudioTrackAdapters> audio_tracks,
91 scoped_ptr<RemoteVideoTrackAdapters> video_tracks); 91 scoped_ptr<RemoteVideoTrackAdapters> video_tracks);
92 92
93 const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_; 93 const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_;
94 base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_; 94 scoped_refptr<Observer> observer_;
95 const scoped_refptr<Observer> observer_; // must be after weak_factory_
96 95
97 RemoteVideoTrackAdapters video_track_observers_; 96 RemoteVideoTrackAdapters video_track_observers_;
98 RemoteAudioTrackAdapters audio_track_observers_; 97 RemoteAudioTrackAdapters audio_track_observers_;
99 blink::WebMediaStream webkit_stream_; 98 blink::WebMediaStream webkit_stream_;
100 99
100 base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_;
101
101 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl); 102 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl);
102 }; 103 };
103 104
104 } // namespace content 105 } // namespace content
105 106
106 #endif // CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ 107 #endif // CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/streams/stream_url_request_job.cc ('k') | content/renderer/media/remote_media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698