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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/remote_media_stream_impl.h
diff --git a/content/renderer/media/remote_media_stream_impl.h b/content/renderer/media/remote_media_stream_impl.h
index 0c230bac73fb3b43d173eb26032c2630efe21799..ec97f233ed9443420879e0e3eaf89e694a5ab637 100644
--- a/content/renderer/media/remote_media_stream_impl.h
+++ b/content/renderer/media/remote_media_stream_impl.h
@@ -91,13 +91,14 @@ class CONTENT_EXPORT RemoteMediaStreamImpl {
scoped_ptr<RemoteVideoTrackAdapters> video_tracks);
const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_;
- base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_;
- const scoped_refptr<Observer> observer_; // must be after weak_factory_
+ scoped_refptr<Observer> observer_;
RemoteVideoTrackAdapters video_track_observers_;
RemoteAudioTrackAdapters audio_track_observers_;
blink::WebMediaStream webkit_stream_;
+ base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl);
};
« 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