<!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>[202265] 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/202265">202265</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-20 20:26:57 -0700 (Mon, 20 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202252">r202252</a>.
https://bugs.webkit.org/show_bug.cgi?id=158974
See rdar://problem/26867866 for details (Requested by ap on
#webkit).
Reverted changeset:
"Adopt commitPriority to get rid of the 2 AVPL solution for
PiP"
https://bugs.webkit.org/show_bug.cgi?id=158949
http://trac.webkit.org/changeset/202252</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcVideoFullscreenLayerManagerh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcVideoFullscreenLayerManagermm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/ChangeLog 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-06-20 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r202252.
+ https://bugs.webkit.org/show_bug.cgi?id=158974
+
+ See rdar://problem/26867866 for details (Requested by ap on
+ #webkit).
+
+ Reverted changeset:
+
+ "Adopt commitPriority to get rid of the 2 AVPL solution for
+ PiP"
+ https://bugs.webkit.org/show_bug.cgi?id=158949
+ http://trac.webkit.org/changeset/202252
+
+2016-06-20 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r202243.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158972
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -340,6 +340,7 @@
</span><span class="cx"> RetainPtr<AVPlayer> m_avPlayer;
</span><span class="cx"> RetainPtr<AVPlayerItem> m_avPlayerItem;
</span><span class="cx"> RetainPtr<AVPlayerLayer> m_videoLayer;
</span><ins>+ RetainPtr<AVPlayerLayer> m_secondaryVideoLayer;
</ins><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><span class="cx"> std::unique_ptr<VideoFullscreenLayerManager> m_videoFullscreenLayerManager;
</span><span class="cx"> MediaPlayer::VideoGravity m_videoFullscreenGravity;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -734,17 +734,25 @@
</span><span class="cx"> [m_videoLayer setPlayer:m_avPlayer.get()];
</span><span class="cx"> [m_videoLayer setBackgroundColor:cachedCGColor(Color::black)];
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ m_secondaryVideoLayer = adoptNS([allocAVPlayerLayerInstance() init]);
+ [m_secondaryVideoLayer setPlayer:m_avPlayer.get()];
+ [m_secondaryVideoLayer setBackgroundColor:cachedCGColor(Color::black)];
+#endif
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> [m_videoLayer setName:@"MediaPlayerPrivate AVPlayerLayer"];
</span><ins>+ [m_secondaryVideoLayer setName:@"MediaPlayerPrivate AVPlayerLayer secondary"];
</ins><span class="cx"> #endif
</span><span class="cx"> [m_videoLayer addObserver:m_objcObserver.get() forKeyPath:@"readyForDisplay" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextAVPlayerLayer];
</span><span class="cx"> updateVideoLayerGravity();
</span><span class="cx"> [m_videoLayer setContentsScale:player()->client().mediaPlayerContentsScale()];
</span><ins>+ [m_secondaryVideoLayer setContentsScale:player()->client().mediaPlayerContentsScale()];
</ins><span class="cx"> IntSize defaultSize = snappedIntRect(player()->client().mediaPlayerContentBoxRect()).size();
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoLayer(%p) - returning %p", this, m_videoLayer.get());
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><del>- m_videoFullscreenLayerManager->setVideoLayer(m_videoLayer.get(), defaultSize);
</del><ins>+ m_videoFullscreenLayerManager->setVideoLayers(m_videoLayer.get(), m_secondaryVideoLayer.get(), defaultSize);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if ([m_videoLayer respondsToSelector:@selector(setPIPModeEnabled:)])
</span><span class="lines">@@ -752,6 +760,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #else
</span><span class="cx"> [m_videoLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
</span><ins>+ [m_secondaryVideoLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -764,6 +773,7 @@
</span><span class="cx">
</span><span class="cx"> [m_videoLayer removeObserver:m_objcObserver.get() forKeyPath:@"readyForDisplay"];
</span><span class="cx"> [m_videoLayer setPlayer:nil];
</span><ins>+ [m_secondaryVideoLayer setPlayer:nil];
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><span class="cx"> m_videoFullscreenLayerManager->didDestroyVideoLayer();
</span><span class="lines">@@ -770,6 +780,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_videoLayer = nil;
</span><ins>+ m_secondaryVideoLayer = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaTime MediaPlayerPrivateAVFoundationObjC::getStartDate() const
</span><span class="lines">@@ -1220,7 +1231,8 @@
</span><span class="cx"> {
</span><span class="cx"> m_videoFullscreenGravity = gravity;
</span><span class="cx">
</span><del>- if (!m_videoLayer)
</del><ins>+ auto activeLayer = m_secondaryVideoLayer.get() ?: m_videoLayer.get();
+ if (!activeLayer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSString *videoGravity = AVLayerVideoGravityResizeAspect;
</span><span class="lines">@@ -1233,10 +1245,10 @@
</span><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx">
</span><del>- if ([m_videoLayer videoGravity] == videoGravity)
</del><ins>+ if ([activeLayer videoGravity] == videoGravity)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- [m_videoLayer setVideoGravity:videoGravity];
</del><ins>+ [activeLayer setVideoGravity:videoGravity];
</ins><span class="cx"> syncTextTrackBounds();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1889,6 +1901,7 @@
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx"> NSString* gravity = shouldMaintainAspectRatio() ? AVLayerVideoGravityResizeAspect : AVLayerVideoGravityResize;
</span><span class="cx"> [m_videoLayer.get() setVideoGravity:gravity];
</span><ins>+ [m_secondaryVideoLayer.get() setVideoGravity:gravity];
</ins><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2184,7 +2197,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FloatRect videoFullscreenFrame = m_videoFullscreenLayerManager->videoFullscreenFrame();
</span><del>- CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : CGRectMake(0, 0, videoFullscreenFrame.width(), videoFullscreenFrame.height());
</del><ins>+ auto activeLayer = m_secondaryVideoLayer.get() ?: m_videoLayer.get();
+ CGRect textFrame = activeLayer ? [activeLayer videoRect] : CGRectMake(0, 0, videoFullscreenFrame.width(), videoFullscreenFrame.height());
</ins><span class="cx"> [m_textTrackRepresentationLayer setFrame:textFrame];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx"> m_player->firstVideoFrameAvailable();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><del>- m_videoFullscreenLayerManager->setVideoLayer(m_sampleBufferDisplayLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
</del><ins>+ m_videoFullscreenLayerManager->setVideoLayers(m_sampleBufferDisplayLayer.get(), nil, snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
</ins><span class="cx"> #endif
</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 (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> m_videoBackgroundLayer.get().name = @"MediaPlayerPrivateMediaStreamAVFObjC preview background layer";
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><del>- m_videoFullscreenLayerManager->setVideoLayer(m_videoBackgroundLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
</del><ins>+ m_videoFullscreenLayerManager->setVideoLayers(m_videoBackgroundLayer.get(), nil, snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcVideoFullscreenLayerManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.h (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.h 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.h 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> PlatformLayer *videoInlineLayer() const { return m_videoInlineLayer.get(); }
</span><span class="cx"> PlatformLayer *videoFullscreenLayer() const { return m_videoFullscreenLayer.get(); }
</span><span class="cx"> FloatRect videoFullscreenFrame() const { return m_videoFullscreenFrame; }
</span><del>- void setVideoLayer(PlatformLayer *, IntSize contentSize);
</del><ins>+ void setVideoLayers(PlatformLayer *, PlatformLayer *, IntSize contentSize);
</ins><span class="cx"> void setVideoFullscreenLayer(PlatformLayer *, std::function<void()> completionHandler);
</span><span class="cx"> void setVideoFullscreenFrame(FloatRect);
</span><span class="cx"> void didDestroyVideoLayer();
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> RetainPtr<PlatformLayer> m_videoInlineLayer;
</span><span class="cx"> RetainPtr<PlatformLayer> m_videoFullscreenLayer;
</span><span class="cx"> RetainPtr<PlatformLayer> m_videoLayer;
</span><ins>+ RetainPtr<PlatformLayer> m_secondaryVideoLayer;
</ins><span class="cx"> FloatRect m_videoFullscreenFrame;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcVideoFullscreenLayerManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -66,11 +66,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VideoFullscreenLayerManager::setVideoLayer(PlatformLayer *videoLayer, IntSize contentSize)
</del><ins>+void VideoFullscreenLayerManager::setVideoLayers(PlatformLayer *videoLayer, PlatformLayer *secondaryVideoLayer, IntSize contentSize)
</ins><span class="cx"> {
</span><span class="cx"> m_videoLayer = videoLayer;
</span><ins>+ m_secondaryVideoLayer = secondaryVideoLayer;
</ins><span class="cx">
</span><span class="cx"> [m_videoLayer web_disableAllActions];
</span><ins>+ [m_secondaryVideoLayer web_disableAllActions];
</ins><span class="cx"> m_videoInlineLayer = adoptNS([[WebVideoContainerLayer alloc] init]);
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> [m_videoInlineLayer setName:@"WebVideoContainerLayer"];
</span><span class="lines">@@ -77,11 +79,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> [m_videoInlineLayer setFrame:CGRectMake(0, 0, contentSize.width(), contentSize.height())];
</span><span class="cx"> if (m_videoFullscreenLayer) {
</span><del>- [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
- [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
</del><ins>+ [m_videoLayer removeFromSuperlayer];
+ PlatformLayer *activeLayer = secondaryVideoLayer ? secondaryVideoLayer : videoLayer;
+ [activeLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
+ [m_videoFullscreenLayer insertSublayer:activeLayer atIndex:0];
</ins><span class="cx"> } else {
</span><span class="cx"> [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
</span><span class="cx"> [m_videoLayer setFrame:m_videoInlineLayer.get().bounds];
</span><ins>+ [m_secondaryVideoLayer removeFromSuperlayer];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,24 +102,47 @@
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx">
</span><del>- if (m_videoLayer) {
- CAContext *oldContext = [m_videoLayer context];
</del><ins>+ if (m_secondaryVideoLayer && m_videoLayer) {
+ if (m_videoFullscreenLayer) {
+ [m_videoFullscreenLayer insertSublayer:m_secondaryVideoLayer.get() atIndex:0];
+ [m_secondaryVideoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
+ } else if (m_videoInlineLayer) {
+ [m_videoLayer setFrame:[m_videoInlineLayer bounds]];
+ [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
+ }
</ins><span class="cx">
</span><ins>+ RetainPtr<PlatformLayer> fullscreenLayer = m_videoFullscreenLayer;
+ RetainPtr<PlatformLayer> videoLayer = m_videoLayer;
+ RetainPtr<PlatformLayer> secondaryVideoLayer = m_secondaryVideoLayer;
+
+ [CATransaction setCompletionBlock:[completionHandler, fullscreenLayer, videoLayer, secondaryVideoLayer] {
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
+
+ if (fullscreenLayer)
+ [videoLayer removeFromSuperlayer];
+ else
+ [secondaryVideoLayer removeFromSuperlayer];
+
+ [CATransaction setCompletionBlock:[completionHandler] {
+ completionHandler();
+ }];
+ [CATransaction commit];
+ }];
+ } else if (m_videoLayer) {
</ins><span class="cx"> if (m_videoFullscreenLayer) {
</span><span class="cx"> [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
</span><span class="cx"> [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
</span><span class="cx"> } else if (m_videoInlineLayer) {
</span><span class="cx"> [m_videoLayer setFrame:[m_videoInlineLayer bounds]];
</span><ins>+ [m_videoLayer removeFromSuperlayer];
</ins><span class="cx"> [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
</span><span class="cx"> } else
</span><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><span class="cx">
</span><del>- CAContext *newContext = [m_videoLayer context];
</del><ins>+ CAContext *oldContext = [m_videoFullscreenLayer context];
+ CAContext *newContext = [m_videoInlineLayer context];
</ins><span class="cx"> if (oldContext && newContext && oldContext != newContext) {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
- [oldContext setCommitPriority:0];
- [newContext setCommitPriority:1];
-#endif
</del><span class="cx"> mach_port_t fencePort = [oldContext createFencePort];
</span><span class="cx"> [newContext setFencePort:fencePort];
</span><span class="cx"> mach_port_deallocate(mach_task_self(), fencePort);
</span><span class="lines">@@ -138,15 +166,18 @@
</span><span class="cx"> if (!m_videoFullscreenLayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [m_videoLayer setFrame:CGRectMake(0, 0, videoFullscreenFrame.width(), videoFullscreenFrame.height())];
</del><ins>+ PlatformLayer *activeLayer = m_secondaryVideoLayer.get() ? m_secondaryVideoLayer.get() : m_videoLayer.get();
+ [activeLayer setFrame:CGRectMake(0, 0, videoFullscreenFrame.width(), videoFullscreenFrame.height())];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VideoFullscreenLayerManager::didDestroyVideoLayer()
</span><span class="cx"> {
</span><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><ins>+ [m_secondaryVideoLayer removeFromSuperlayer];
</ins><span class="cx">
</span><span class="cx"> m_videoInlineLayer = nil;
</span><span class="cx"> m_videoLayer = nil;
</span><ins>+ m_secondaryVideoLayer = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (202264 => 202265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-06-21 03:22:53 UTC (rev 202264)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-06-21 03:26:57 UTC (rev 202265)
</span><span class="lines">@@ -59,9 +59,6 @@
</span><span class="cx"> - (mach_port_t)createFencePort;
</span><span class="cx"> - (void)setFencePort:(mach_port_t)port;
</span><span class="cx"> - (void)setFencePort:(mach_port_t)port commitHandler:(void(^)(void))block;
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
-@property uint32_t commitPriority;
-#endif
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> @property BOOL colorMatchUntaggedContent;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>