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

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2389473002: Media Remoting: Add RemotingController. (Closed)
Patch Set: Rebased. Created 4 years, 2 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
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 0458a9a1af3b01654613c797a7ea4453ea2eae10..c8e5a00b44befc389c74c0631fb91b561f3e0595 100644
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -785,9 +785,17 @@ std::unique_ptr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
HTMLMediaElementEncryptedMedia& encryptedMedia =
HTMLMediaElementEncryptedMedia::from(htmlMediaElement);
WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement));
- return wrapUnique(webFrame->client()->createMediaPlayer(
- source, client, &encryptedMedia, encryptedMedia.contentDecryptionModule(),
- sinkId));
+ std::unique_ptr<WebMediaPlayer> mediaPlayer =
+ wrapUnique(webFrame->client()->createMediaPlayer(
+ source, client, &encryptedMedia,
+ encryptedMedia.contentDecryptionModule(), sinkId));
+
+ Element* fullscreenElement =
+ Fullscreen::currentFullScreenElementFrom(htmlMediaElement.document());
+ if (fullscreenElement->contains(&htmlMediaElement))
esprehn 2016/10/08 03:33:04 This doesn't understand shadow dom, also what if t
xjz 2016/10/10 19:31:02 Removed this from this CL. As commented, will open
+ mediaPlayer->ancestorEnteredFullscreen();
+
+ return mediaPlayer;
}
ObjectContentType FrameLoaderClientImpl::getObjectContentType(

Powered by Google App Engine
This is Rietveld 408576698