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

Unified Diff: content/renderer/media/android/media_source_delegate.cc

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 1654e1314e0c3e7eb87d9bdd43f53bd79e1b3277..88addced8f214fe52fc74d190e6e32514c3347fe 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -50,12 +50,7 @@ MediaSourceDelegate::MediaSourceDelegate(
int demuxer_client_id,
const scoped_refptr<base::MessageLoopProxy>& media_loop,
media::MediaLog* media_log)
- : main_loop_(base::MessageLoopProxy::current()),
- main_weak_factory_(this),
- main_weak_this_(main_weak_factory_.GetWeakPtr()),
- media_loop_(media_loop),
- media_weak_factory_(this),
- demuxer_client_(demuxer_client),
+ : demuxer_client_(demuxer_client),
demuxer_client_id_(demuxer_client_id),
media_log_(media_log),
is_demuxer_ready_(false),
@@ -66,7 +61,12 @@ MediaSourceDelegate::MediaSourceDelegate(
doing_browser_seek_(false),
browser_seek_time_(media::kNoTimestamp()),
expecting_regular_seek_(false),
- access_unit_size_(0) {
+ access_unit_size_(0),
+ main_loop_(base::MessageLoopProxy::current()),
+ media_loop_(media_loop),
+ main_weak_factory_(this),
+ media_weak_factory_(this),
+ main_weak_this_(main_weak_factory_.GetWeakPtr()) {
DCHECK(main_loop_->BelongsToCurrentThread());
}
« no previous file with comments | « content/renderer/media/android/media_source_delegate.h ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698