Commit de1820c1 authored by qinmin@chromium.org's avatar qinmin@chromium.org

Don't use webmediaplayer to inform webview about fullscreen change

Currently we rely on webmediaplayer to inform webview about fullscreen change.
With https://codereview.chromium.org/277823002/, we no longer need to do so.
When entering fullscreen, the page will be resized to fullscreen, and that will call Will/DidEnterFullscreen for us.
When leaving the fullscreen, ToggleFullscreenForTab() will request the tab to exit fullscreen. That should trigger the Resize() call and send Will/DidExitFullscreen for us.

BUG=367346

Review URL: https://codereview.chromium.org/275163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270005 0039d316-1c4b-4281-b951-d872f2087c98
parent bcaa76d5
...@@ -199,10 +199,10 @@ void BrowserMediaPlayerManager::FullscreenPlayerSeek(int msec) { ...@@ -199,10 +199,10 @@ void BrowserMediaPlayerManager::FullscreenPlayerSeek(int msec) {
} }
void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) {
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableOverlayFullscreenVideoSubtitle)) {
if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) if (WebContentsDelegate* delegate = web_contents_->GetDelegate())
delegate->ToggleFullscreenModeForTab(web_contents_, false); delegate->ToggleFullscreenModeForTab(web_contents_, false);
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableOverlayFullscreenVideoSubtitle)) {
if (RenderWidgetHostViewAndroid* view_android = if (RenderWidgetHostViewAndroid* view_android =
static_cast<RenderWidgetHostViewAndroid*>( static_cast<RenderWidgetHostViewAndroid*>(
web_contents_->GetRenderWidgetHostView())) { web_contents_->GetRenderWidgetHostView())) {
...@@ -251,8 +251,6 @@ void BrowserMediaPlayerManager::SetVideoSurface( ...@@ -251,8 +251,6 @@ void BrowserMediaPlayerManager::SetVideoSurface(
web_contents_->GetRenderWidgetHostView())) { web_contents_->GetRenderWidgetHostView())) {
view_android->SetOverlayVideoMode(true); view_android->SetOverlayVideoMode(true);
} }
if (WebContentsDelegate* delegate = web_contents_->GetDelegate())
delegate->ToggleFullscreenModeForTab(web_contents_, true);
} }
void BrowserMediaPlayerManager::OnMediaMetadataChanged( void BrowserMediaPlayerManager::OnMediaMetadataChanged(
......
...@@ -762,8 +762,6 @@ void WebMediaPlayerAndroid::OnDisconnectedFromRemoteDevice() { ...@@ -762,8 +762,6 @@ void WebMediaPlayerAndroid::OnDisconnectedFromRemoteDevice() {
void WebMediaPlayerAndroid::OnDidEnterFullscreen() { void WebMediaPlayerAndroid::OnDidEnterFullscreen() {
if (!manager_->IsInFullscreen(frame_)) { if (!manager_->IsInFullscreen(frame_)) {
frame_->view()->willEnterFullScreen();
frame_->view()->didEnterFullScreen();
manager_->DidEnterFullscreen(frame_); manager_->DidEnterFullscreen(frame_);
} }
} }
...@@ -782,8 +780,6 @@ void WebMediaPlayerAndroid::OnDidExitFullscreen() { ...@@ -782,8 +780,6 @@ void WebMediaPlayerAndroid::OnDidExitFullscreen() {
manager_->RequestExternalSurface(player_id_, last_computed_rect_); manager_->RequestExternalSurface(player_id_, last_computed_rect_);
#endif // defined(VIDEO_HOLE) #endif // defined(VIDEO_HOLE)
frame_->view()->willExitFullScreen();
frame_->view()->didExitFullScreen();
manager_->DidExitFullscreen(); manager_->DidExitFullscreen();
client_->repaint(); client_->repaint();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment