content/renderer/media/android/webmediaplayer_android.h - Issue 605013002: Refactor MediaSourceDelegate destruction.

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/android/webmediaplayer_android.h

Issue 605013002: Refactor MediaSourceDelegate destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mp4_stream_parser_hack

Patch Set: comments addressed Created 6 years, 3 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

« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.h

diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h

index 1a2797708f4f5806813b31c1788afffbfd95f2c4..709eeea636c6e5ed6959aa3f2a000b217524082e 100644

--- a/content/renderer/media/android/webmediaplayer_android.h

+++ b/content/renderer/media/android/webmediaplayer_android.h

@@ -455,9 +455,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

bool force_use_overlay_embedded_video_;

#endif // defined(VIDEO_HOLE)

- scoped_ptr<MediaSourceDelegate,

- MediaSourceDelegate::Destroyer> media_source_delegate_;

MediaPlayerHostMsg_Initialize_Type player_type_;

// Whether the browser is currently connected to a remote media player.

@@ -503,6 +500,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

// as playback progresses.

media::TimeDeltaInterpolator interpolator_;

+ scoped_ptr<MediaSourceDelegate> media_source_delegate_;

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

base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;