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

Unified Diff: content/renderer/media/android/renderer_media_player_manager.h

Issue 136113015: Fix fullscreen video race condition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address raised issues Created 6 years, 11 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 | « no previous file | content/renderer/media/android/renderer_media_player_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/renderer_media_player_manager.h
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
index b68f3940d8e590b0018bf332e3dbbdd0abc0138f..614b875355ea42d14ad1a31240fc6066e1070b30 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -71,7 +71,7 @@ class RendererMediaPlayerManager : public RenderViewObserver {
void DestroyPlayer(int player_id);
// Requests the player to enter fullscreen.
- void EnterFullscreen(int player_id);
+ void EnterFullscreen(int player_id, blink::WebFrame* frame);
// Requests the player to exit fullscreen.
void ExitFullscreen(int player_id);
@@ -123,6 +123,9 @@ class RendererMediaPlayerManager : public RenderViewObserver {
// Checks whether the Webframe is in fullscreen.
bool IsInFullscreen(blink::WebFrame* frame);
+ // True if a newly created media player should enter fullscreen.
+ bool ShouldEnterFullscreen(blink::WebFrame* frame);
+
// Gets the pointer to WebMediaPlayerAndroid given the |player_id|.
WebMediaPlayerAndroid* GetMediaPlayer(int player_id);
@@ -183,6 +186,9 @@ class RendererMediaPlayerManager : public RenderViewObserver {
// WebFrame of the fullscreen video.
blink::WebFrame* fullscreen_frame_;
+ // WebFrame of pending fullscreen request.
+ blink::WebFrame* pending_fullscreen_frame_;
+
DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
};
« no previous file with comments | « no previous file | content/renderer/media/android/renderer_media_player_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698