<!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>[184764] branches/safari-601.1.32.2-branch/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/184764">184764</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 01:01:38 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184760">r184760</a>. rdar://problem/21064692</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebCoreChangeLog">branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCorehtmlHTMLVideoElementcpp">branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLVideoElement.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformgraphicsMediaPlayercpp">branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformgraphicsMediaPlayerh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformgraphicsMediaPlayerPrivateh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformspimacAVFoundationSPIh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2015-05-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184760.
+
+ 2015-05-21 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Tell AVPlayerLayer when we enter optimized fullscreen mode.
+ https://bugs.webkit.org/show_bug.cgi?id=145289
+
+ Reviewed by Eric Carlson.
+
+ AVFoundation would normally already know that its AVPlayerLayer is in optimized
+ fullscreen mode, but because of the WebProcess/UIProcess split, they need to be
+ told explicitly in the WebProcess when the UIProcess enters optimized fullscreen
+ mode.
+
+ * html/HTMLMediaElement.h:
+ * html/HTMLVideoElement.cpp:
+ (WebCore::HTMLVideoElement::fullscreenModeChanged): Pass to private().
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::setVideoFullscreenMode): Pass to m_private.
+ (WebCore::MediaPlayer::fullscreenMode): Pass to m_client.
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerFullscreenMode): Default implementation returns None.
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::setVideoFullscreenMode): Default implementation is a no-op.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer): Get the fullscreen
+ mode from MediaPlayer and tell the AVPlayerLayer if the mode is optimized.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenMode):
+ Ditto.
+ * platform/spi/mac/AVFoundationSPI.h:
+
+2015-05-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184670.
</span><span class="cx">
</span><span class="cx"> 2015-05-19 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLMediaElement.h 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -578,6 +578,7 @@
</span><span class="cx"> virtual void mediaPlayerEngineFailedToLoad() const override final;
</span><span class="cx">
</span><span class="cx"> virtual double mediaPlayerRequestedPlaybackRate() const override final;
</span><ins>+ virtual VideoFullscreenMode mediaPlayerFullscreenMode() const override final { return fullscreenMode(); }
</ins><span class="cx">
</span><span class="cx"> void pendingActionTimerFired();
</span><span class="cx"> void progressEventTimerFired();
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCorehtmlHTMLVideoElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLVideoElement.cpp (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLVideoElement.cpp 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/html/HTMLVideoElement.cpp 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -419,6 +419,9 @@
</span><span class="cx"> scheduleEvent(eventNames().webkitpresentationmodechangedEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (player())
+ player()->setVideoFullscreenMode(mode);
+
</ins><span class="cx"> HTMLMediaElement::fullscreenModeChanged(mode);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -620,6 +620,16 @@
</span><span class="cx"> m_private->setVideoFullscreenGravity(gravity);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayer::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode)
+{
+ m_private->setVideoFullscreenMode(mode);
+}
+
+MediaPlayer::VideoFullscreenMode MediaPlayer::fullscreenMode() const
+{
+ return m_client.mediaPlayerFullscreenMode();
+}
+
</ins><span class="cx"> NSArray* MediaPlayer::timedMetadata() const
</span><span class="cx"> {
</span><span class="cx"> return m_private->timedMetadata();
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -276,6 +276,7 @@
</span><span class="cx"> virtual void mediaPlayerEngineFailedToLoad() const { }
</span><span class="cx">
</span><span class="cx"> virtual double mediaPlayerRequestedPlaybackRate() const { return 0; }
</span><ins>+ virtual MediaPlayerEnums::VideoFullscreenMode mediaPlayerFullscreenMode() const { return MediaPlayerEnums::VideoFullscreenModeNone; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaPlayerSupportsTypeClient {
</span><span class="lines">@@ -314,6 +315,8 @@
</span><span class="cx"> void setVideoFullscreenFrame(FloatRect);
</span><span class="cx"> using MediaPlayerEnums::VideoGravity;
</span><span class="cx"> void setVideoFullscreenGravity(VideoGravity);
</span><ins>+ void setVideoFullscreenMode(VideoFullscreenMode);
+ VideoFullscreenMode fullscreenMode() const;
</ins><span class="cx">
</span><span class="cx"> NSArray *timedMetadata() const;
</span><span class="cx"> String accessLog() const;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> virtual void setVideoFullscreenLayer(PlatformLayer*) { }
</span><span class="cx"> virtual void setVideoFullscreenFrame(FloatRect) { }
</span><span class="cx"> virtual void setVideoFullscreenGravity(MediaPlayer::VideoGravity) { }
</span><ins>+ virtual void setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode) { }
</ins><span class="cx">
</span><span class="cx"> virtual NSArray *timedMetadata() const { return 0; }
</span><span class="cx"> virtual String accessLog() const { return emptyString(); }
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -159,6 +159,7 @@
</span><span class="cx"> virtual void setVideoFullscreenLayer(PlatformLayer*);
</span><span class="cx"> virtual void setVideoFullscreenFrame(FloatRect);
</span><span class="cx"> virtual void setVideoFullscreenGravity(MediaPlayer::VideoGravity);
</span><ins>+ virtual void setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode) override;
</ins><span class="cx">
</span><span class="cx"> virtual NSArray *timedMetadata() const override;
</span><span class="cx"> virtual String accessLog() const;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -693,6 +693,8 @@
</span><span class="cx"> [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
</span><span class="cx"> [m_videoLayer setFrame:m_videoInlineLayer.get().bounds];
</span><span class="cx"> }
</span><ins>+ if ([m_videoLayer respondsToSelector:@selector(setEnterOptimizedFullscreenModeEnabled:)])
+ [m_videoLayer setEnterOptimizedFullscreenModeEnabled:(player()->fullscreenMode() & MediaPlayer::VideoFullscreenModeOptimized)];
</ins><span class="cx"> #else
</span><span class="cx"> [m_videoLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
</span><span class="cx"> #endif
</span><span class="lines">@@ -1182,6 +1184,12 @@
</span><span class="cx"> [m_videoLayer setVideoGravity:videoGravity];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode)
+{
+ if (m_videoLayer && [m_videoLayer respondsToSelector:@selector(setEnterOptimizedFullscreenModeEnabled:)])
+ [m_videoLayer setEnterOptimizedFullscreenModeEnabled:(mode & MediaPlayer::VideoFullscreenModeOptimized)];
+}
+
</ins><span class="cx"> NSArray *MediaPlayerPrivateAVFoundationObjC::timedMetadata() const
</span><span class="cx"> {
</span><span class="cx"> if (m_currentMetaData)
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformspimacAVFoundationSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (184763 => 184764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-05-22 08:00:46 UTC (rev 184763)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-05-22 08:01:38 UTC (rev 184764)
</span><span class="lines">@@ -49,4 +49,19 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+#if PLATFORM(IOS)
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVPlayerViewController_WebKitOnly.h>
</ins><span class="cx"> #endif
</span><ins>+
+#import <AVFoundation/AVPlayerLayer.h>
+
+@interface AVPlayerLayer (AVPlayerLayerOptimizedFullscreenModeSupportPrivate)
+- (void)setEnterOptimizedFullscreenModeEnabled:(BOOL)flag;
+@end
+
+#endif
+
</ins></span></pre>
</div>
</div>
</body>
</html>