<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197807] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197807">197807</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-08 15:16:29 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable API related to the video fullscreen layer in MediaPlayerPrivateMediaStreamAVFObjC for Mac.
https://bugs.webkit.org/show_bug.cgi?id=153239
Reviewed by Eric Carlson.
Reuse VideoFullscreenLayerManager to manage moving the video layer between the fullscreen
layer and the inline layer depending on the current presentation mode.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC):
Create m_videoFullscreenLayerManager.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer):
Return the video inline layer from the VideoFullscreenLayerManager.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers):
Call VideoFullscreenLayerManager::setVideoLayer() with the m_videoBackgroundLayer. To make sure
the preview layer (a sublayer of m_videoBackgroundLayer) resize according to aspect ratio, set
its contents gravity to kCAGravityResizeAspect. Also, set its autoresizing mask so it'll resize
with its superlayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer):
Call VideoFullscreenLayerManager::setVideoFullscreenLayer().
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenFrame):
Call VideoFullscreenLayerManager::setVideoFullscreenFrame().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197806 => 197807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-08 23:02:55 UTC (rev 197806)
+++ trunk/Source/WebCore/ChangeLog 2016-03-08 23:16:29 UTC (rev 197807)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-03-08 Ada Chan <adachan@apple.com>
+
+ Enable API related to the video fullscreen layer in MediaPlayerPrivateMediaStreamAVFObjC for Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=153239
+
+ Reviewed by Eric Carlson.
+
+ Reuse VideoFullscreenLayerManager to manage moving the video layer between the fullscreen
+ layer and the inline layer depending on the current presentation mode.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC):
+ Create m_videoFullscreenLayerManager.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer):
+ Return the video inline layer from the VideoFullscreenLayerManager.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers):
+ Call VideoFullscreenLayerManager::setVideoLayer() with the m_videoBackgroundLayer. To make sure
+ the preview layer (a sublayer of m_videoBackgroundLayer) resize according to aspect ratio, set
+ its contents gravity to kCAGravityResizeAspect. Also, set its autoresizing mask so it'll resize
+ with its superlayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer):
+ Call VideoFullscreenLayerManager::setVideoFullscreenLayer().
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenFrame):
+ Call VideoFullscreenLayerManager::setVideoFullscreenFrame().
+
</ins><span class="cx"> 2016-03-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Font Loading] Crash when a single load request causes multiple fonts to fail loading
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (197806 => 197807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-03-08 23:02:55 UTC (rev 197806)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-03-08 23:16:29 UTC (rev 197807)
</span><span class="lines">@@ -46,6 +46,10 @@
</span><span class="cx"> class MediaSourcePrivateClient;
</span><span class="cx"> class VideoTrackPrivateMediaStream;
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+class VideoFullscreenLayerManager;
+#endif
+
</ins><span class="cx"> class MediaPlayerPrivateMediaStreamAVFObjC : public MediaPlayerPrivateInterface, public MediaStreamPrivate::Observer {
</span><span class="cx"> public:
</span><span class="cx"> explicit MediaPlayerPrivateMediaStreamAVFObjC(MediaPlayer*);
</span><span class="lines">@@ -155,6 +159,11 @@
</span><span class="cx"> void didAddTrack(MediaStreamTrackPrivate&) override;
</span><span class="cx"> void didRemoveTrack(MediaStreamTrackPrivate&) override;
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ void setVideoFullscreenLayer(PlatformLayer*) override;
+ void setVideoFullscreenFrame(FloatRect) override;
+#endif
+
</ins><span class="cx"> MediaPlayer* m_player { nullptr };
</span><span class="cx"> WeakPtrFactory<MediaPlayerPrivateMediaStreamAVFObjC> m_weakPtrFactory;
</span><span class="cx"> RefPtr<MediaStreamPrivate> m_mediaStreamPrivate;
</span><span class="lines">@@ -175,6 +184,10 @@
</span><span class="cx"> bool m_muted { false };
</span><span class="cx"> bool m_haveEverPlayed { false };
</span><span class="cx"> bool m_ended { false };
</span><ins>+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ std::unique_ptr<VideoFullscreenLayerManager> m_videoFullscreenLayerManager;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (197806 => 197807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-03-08 23:02:55 UTC (rev 197806)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-03-08 23:16:29 UTC (rev 197807)
</span><span class="lines">@@ -42,6 +42,10 @@
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+#import "VideoFullscreenLayerManager.h"
+#endif
+
</ins><span class="cx"> #pragma mark - Soft Linking
</span><span class="cx">
</span><span class="cx"> #import "CoreMediaSoftLink.h"
</span><span class="lines">@@ -57,6 +61,9 @@
</span><span class="cx"> : m_player(player)
</span><span class="cx"> , m_weakPtrFactory(this)
</span><span class="cx"> , m_clock(Clock::create())
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ , m_videoFullscreenLayerManager(VideoFullscreenLayerManager::create())
+#endif
</ins><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC(%p)", this);
</span><span class="cx"> }
</span><span class="lines">@@ -153,7 +160,11 @@
</span><span class="cx"> if (!m_videoBackgroundLayer || m_displayMode == None)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ return m_videoFullscreenLayerManager->videoInlineLayer();
+#else
</ins><span class="cx"> return m_videoBackgroundLayer.get();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateMediaStreamAVFObjC::DisplayMode MediaPlayerPrivateMediaStreamAVFObjC::currentDisplayMode() const
</span><span class="lines">@@ -391,17 +402,25 @@
</span><span class="cx"> if (!m_videoBackgroundLayer) {
</span><span class="cx"> m_videoBackgroundLayer = adoptNS([[CALayer alloc] init]);
</span><span class="cx"> m_videoBackgroundLayer.get().name = @"MediaPlayerPrivateMediaStreamAVFObjC preview background layer";
</span><ins>+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ m_videoFullscreenLayerManager->setVideoLayer(m_videoBackgroundLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_previewLayer) {
</span><span class="cx"> m_previewLayer = m_mediaStreamPrivate->platformLayer();
</span><span class="cx"> if (m_previewLayer) {
</span><del>- m_previewLayer.get().contentsGravity = kCAGravityResize;
</del><ins>+ m_previewLayer.get().contentsGravity = kCAGravityResizeAspect;
</ins><span class="cx"> m_previewLayer.get().anchorPoint = CGPointZero;
</span><span class="cx"> if (!m_playing)
</span><span class="cx"> m_previewLayer.get().hidden = true;
</span><span class="cx">
</span><span class="cx"> [m_videoBackgroundLayer addSublayer:m_previewLayer.get()];
</span><ins>+#if PLATFORM(MAC)
+ [m_previewLayer setFrame:[m_videoBackgroundLayer bounds]];
+ [m_previewLayer setAutoresizingMask:(kCALayerWidthSizable | kCALayerHeightSizable)];
+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -454,6 +473,18 @@
</span><span class="cx"> updateTracks();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer *videoFullscreenLayer)
+{
+ m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer);
+}
+
+void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenFrame(FloatRect frame)
+{
+ m_videoFullscreenLayerManager->setVideoFullscreenFrame(frame);
+}
+#endif
+
</ins><span class="cx"> template <typename RefT, typename PassRefT>
</span><span class="cx"> void updateTracksOfType(HashMap<String, RefT>& trackMap, RealtimeMediaSource::Type trackType, MediaStreamTrackPrivateVector& currentTracks, RefT (*itemFactory)(MediaStreamTrackPrivate&), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT), std::function<void(RefT, int)> configureCallback)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>