summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/media/android/webmediaplayer_android.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-02 10:15:40 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-06-02 08:41:08 +0000
commitb92421879c003a0857b2074f7e05b3bbbb326569 (patch)
treebdfd21ad74690ae4069e4a055191844994027b78 /chromium/content/renderer/media/android/webmediaplayer_android.cc
parent980b784afe75be22158126ac6a639c19459d3427 (diff)
downloadqtwebengine-chromium-b92421879c003a0857b2074f7e05b3bbbb326569.tar.gz
BASELINE: Update Chromium to 51.0.2704.79
Also adds a few files for url_parsing in extensions. Change-Id: Ie4820c3da75f0a56b3cc86dccc077d671227077b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'chromium/content/renderer/media/android/webmediaplayer_android.cc')
-rw-r--r--chromium/content/renderer/media/android/webmediaplayer_android.cc13
1 files changed, 0 insertions, 13 deletions
diff --git a/chromium/content/renderer/media/android/webmediaplayer_android.cc b/chromium/content/renderer/media/android/webmediaplayer_android.cc
index 955e17df399..91316808395 100644
--- a/chromium/content/renderer/media/android/webmediaplayer_android.cc
+++ b/chromium/content/renderer/media/android/webmediaplayer_android.cc
@@ -1045,7 +1045,6 @@ void WebMediaPlayerAndroid::OnDidExitFullscreen() {
player_manager_->RequestExternalSurface(player_id_, last_computed_rect_);
#endif // defined(VIDEO_HOLE)
is_fullscreen_ = false;
- ReallocateVideoFrame();
client_->repaint();
}
@@ -1206,8 +1205,6 @@ void WebMediaPlayerAndroid::DrawRemotePlaybackText(
void WebMediaPlayerAndroid::ReallocateVideoFrame() {
DCHECK(main_thread_checker_.CalledOnValidThread());
-
- if (is_fullscreen_) return;
if (needs_external_surface_) {
// VideoFrame::CreateHoleFrame is only defined under VIDEO_HOLE.
#if defined(VIDEO_HOLE)
@@ -1653,16 +1650,6 @@ void WebMediaPlayerAndroid::enteredFullscreen() {
SetNeedsEstablishPeer(false);
is_fullscreen_ = true;
suppress_deleting_texture_ = false;
-
- // Create a transparent video frame. Blink will already have made the
- // background transparent because we returned true from
- // supportsOverlayFullscreenVideo(). By making the video frame transparent,
- // as well, everything in the LayerTreeView will be transparent except for
- // media controls. The video will be on visible on the underlaid surface.
- if (!fullscreen_frame_)
- fullscreen_frame_ = VideoFrame::CreateTransparentFrame(gfx::Size(1, 1));
- SetCurrentFrameInternal(fullscreen_frame_);
- client_->repaint();
}
bool WebMediaPlayerAndroid::IsHLSStream() const {