content/renderer/media/cdm_session_adapter.h - Issue 193303002: WeakPtr destruction order cleanup: media edition.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/cdm_session_adapter.h

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:

Index: content/renderer/media/cdm_session_adapter.h

diff --git a/content/renderer/media/cdm_session_adapter.h b/content/renderer/media/cdm_session_adapter.h

index 611f25b5038cb12c99d83a1ddf4399e81fb9b429..9c8ae0a5ee04b061f7805947d99418f73bdb2bf7 100644

--- a/content/renderer/media/cdm_session_adapter.h

+++ b/content/renderer/media/cdm_session_adapter.h

@@ -87,13 +87,14 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {

scoped_ptr<media::MediaKeys> media_keys_;

- base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;

SessionMap sessions_;

// Session ID should be unique per renderer process for debugging purposes.

static uint32 next_session_id_;

+ // NOTE: Weak pointers must be invalidated before all other member variables.

+ base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;

DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);

};