content/browser/media/android/browser_media_player_manager.h - Issue 231933006: Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

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/browser/media/android/browser_media_player_manager.h

Issue 231933006: Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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

« android_webview/lib/main/aw_main_delegate.cc ('K') | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/media/android/browser_media_player_manager.cc » ('j') | content/browser/media/android/browser_media_player_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/android/browser_media_player_manager.h

diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h

index 8fa1b17323c02af16f76110e571b9e1459b3408f..f3203d583daf110bf35d4a56d4a399f744939188 100644

--- a/content/browser/media/android/browser_media_player_manager.h

+++ b/content/browser/media/android/browser_media_player_manager.h

@@ -31,6 +31,7 @@ class MediaDrmBridge;

namespace content {

class BrowserDemuxerAndroid;

class ContentViewCoreImpl;

+class ExternalVideoSurfaceContainer;

class WebContents;

// This class manages all the MediaPlayerAndroid objects. It receives

@@ -108,6 +109,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager

#if defined(VIDEO_HOLE)

void AttachExternalVideoSurface(int player_id, jobject surface);

void DetachExternalVideoSurface(int player_id);

+ void OnFrameInfoUpdated();

#endif // defined(VIDEO_HOLE)

// Called to disble the current fullscreen playback if the video is encrypted.

@@ -230,6 +232,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager

// fullscreen.

scoped_ptr<ContentVideoView> video_view_;

+#if defined(VIDEO_HOLE)

+ scoped_ptr<ExternalVideoSurfaceContainer> external_video_surface_container_;

+#endif

// Player ID of the fullscreen media player.

int fullscreen_player_id_;