Chromium Code Reviews| Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp |
| diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp |
| index 4bec7cab5832b41887467b6fd69d423848aa384d..a9e68a6629898b64892a25ef34181dff6fa712e0 100644 |
| --- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp |
| +++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp |
| @@ -815,9 +815,19 @@ std::unique_ptr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer( |
| HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMedia::from(htmlMediaElement); |
| WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)); |
| - return wrapUnique(webFrame->client()->createMediaPlayer(source, |
| + std::unique_ptr<WebMediaPlayer> mediaPlayer = wrapUnique(webFrame->client()->createMediaPlayer(source, |
| client, &encryptedMedia, |
| encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession)); |
| + |
| + // Check if video is in fullscreen playing back. |
| + if (Fullscreen::isActiveFullScreenElement(htmlMediaElement)) { |
| + mediaPlayer->videoEnteredFullscreen(); |
| + } else if (htmlMediaElement.isParentInFullscreen()) { |
| + Document& document = htmlMediaElement.document(); |
| + if ((htmlMediaElement.clientWidth() >= document.domWindow()->innerWidth()) && (htmlMediaElement.clientHeight() >= document.domWindow()->innerHeight())) |
|
liberato (no reviews please)
2016/08/29 16:49:12
please consolidate this check with the one in HTML
xjz
2016/09/09 23:13:06
Done.
|
| + mediaPlayer->videoEnteredFullscreen(); |
| + } |
| + return mediaPlayer; |
| } |
| std::unique_ptr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession() |