<!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>[168392] 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/168392">168392</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 16:36:20 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Animate AVPlayerLayer into and out of full screen
https://bugs.webkit.org/show_bug.cgi?id=132603
Reviewed by Simon Fraser.
Rather than synchronize animations across the WebProcess / UIProcess boundary, animate
the AVPlayerLayer into place by first resizing the full screen layer to occupy the
entire screen in the WebProcess, and use a sublayerTransform animation in the UIProcess
to scale the AVPlayer from its initial screen location, as well as back to its final screen
location.
* platform/graphics/GeometryUtilities.cpp:
(WebCore::largestRectWithAspectRatioInsideRect): Added utility method.
* platform/graphics/GeometryUtilities.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(-[WebAVVideoLayer init]): Added, initialize video gravity and enable child layer masking.
(-[WebAVVideoLayer setBounds:]): Create a transform to scale the video area.
(WebVideoFullscreenInterfaceAVKit::enterFullscreen): Block implicit animations during setup.
(WebVideoFullscreenInterfaceAVKit::exitFullscreen): Reset the gravity to ResizeAspect
if necessary.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGeometryUtilitiescpp">trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGeometryUtilitiesh">trunk/Source/WebCore/platform/graphics/GeometryUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168391 => 168392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-06 23:34:35 UTC (rev 168391)
+++ trunk/Source/WebCore/ChangeLog 2014-05-06 23:36:20 UTC (rev 168392)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-06 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Animate AVPlayerLayer into and out of full screen
+ https://bugs.webkit.org/show_bug.cgi?id=132603
+
+ Reviewed by Simon Fraser.
+
+ Rather than synchronize animations across the WebProcess / UIProcess boundary, animate
+ the AVPlayerLayer into place by first resizing the full screen layer to occupy the
+ entire screen in the WebProcess, and use a sublayerTransform animation in the UIProcess
+ to scale the AVPlayer from its initial screen location, as well as back to its final screen
+ location.
+
+ * platform/graphics/GeometryUtilities.cpp:
+ (WebCore::largestRectWithAspectRatioInsideRect): Added utility method.
+ * platform/graphics/GeometryUtilities.h:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVVideoLayer init]): Added, initialize video gravity and enable child layer masking.
+ (-[WebAVVideoLayer setBounds:]): Create a transform to scale the video area.
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreen): Block implicit animations during setup.
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen): Reset the gravity to ResizeAspect
+ if necessary.
+
</ins><span class="cx"> 2014-05-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Make BlobDataItem use a refcounted object for files
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGeometryUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp (168391 => 168392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp 2014-05-06 23:34:35 UTC (rev 168391)
+++ trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp 2014-05-06 23:36:20 UTC (rev 168392)
</span><span class="lines">@@ -101,4 +101,18 @@
</span><span class="cx"> r.width() * widthScale, r.height() * heightScale);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatRect largestRectWithAspectRatioInsideRect(float aspectRatio, const FloatRect& srcRect)
+{
+ FloatRect destRect = srcRect;
+
+ if (aspectRatio > srcRect.size().aspectRatio()) {
+ float dy = destRect.width() / aspectRatio - destRect.height();
+ destRect.inflateY(dy / 2);
+ } else {
+ float dx = destRect.height() * aspectRatio - destRect.width();
+ destRect.inflateX(dx / 2);
+ }
+ return destRect;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGeometryUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GeometryUtilities.h (168391 => 168392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GeometryUtilities.h 2014-05-06 23:34:35 UTC (rev 168391)
+++ trunk/Source/WebCore/platform/graphics/GeometryUtilities.h 2014-05-06 23:36:20 UTC (rev 168392)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> // Map rect r from srcRect to an equivalent rect in destRect.
</span><span class="cx"> FloatRect mapRect(const FloatRect&, const FloatRect& srcRect, const FloatRect& destRect);
</span><span class="cx">
</span><ins>+FloatRect largestRectWithAspectRatioInsideRect(float aspectRatio, const FloatRect&);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // GeometryUtilities_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (168391 => 168392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-05-06 23:34:35 UTC (rev 168391)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-05-06 23:36:20 UTC (rev 168392)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx">
</span><span class="cx"> #import "Logging.h"
</span><ins>+#import "GeometryUtilities.h"
</ins><span class="cx"> #import "WebVideoFullscreenModel.h"
</span><span class="cx"> #import <AVFoundation/AVTime.h>
</span><span class="cx"> #import <AVKit/AVKit.h>
</span><span class="lines">@@ -455,12 +456,14 @@
</span><span class="cx"> @property (nonatomic) AVVideoLayerGravity videoLayerGravity;
</span><span class="cx"> @property (nonatomic, getter = isReadyForDisplay) BOOL readyForDisplay;
</span><span class="cx"> @property (nonatomic) CGRect videoRect;
</span><ins>+- (void)setPlayerViewController:(AVPlayerViewController *)playerViewController;
</ins><span class="cx"> - (void)setPlayerController:(AVPlayerController *)playerController;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebAVVideoLayer
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WebAVPlayerController> _avPlayerController;
</span><ins>+ RetainPtr<AVPlayerViewController> _avPlayerViewController;
</ins><span class="cx"> AVVideoLayerGravity _videoLayerGravity;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -469,17 +472,45 @@
</span><span class="cx"> return [[[WebAVVideoLayer alloc] init] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (instancetype)init
+{
+ self = [super init];
+ if (self) {
+ [self setMasksToBounds:YES];
+ [self setVideoLayerGravity:AVVideoLayerGravityResizeAspect];
+ }
+ return self;
+}
+
</ins><span class="cx"> - (void)setPlayerController:(AVPlayerController *)playerController
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!playerController || [playerController isKindOfClass:[WebAVPlayerController class]]);
</span><span class="cx"> _avPlayerController = (WebAVPlayerController *)playerController;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setPlayerViewController:(AVPlayerViewController *)playerViewController
+{
+ _avPlayerViewController = playerViewController;
+}
+
</ins><span class="cx"> - (void)setBounds:(CGRect)bounds
</span><span class="cx"> {
</span><span class="cx"> [super setBounds:bounds];
</span><del>- if ([_avPlayerController delegate])
- [_avPlayerController delegate]->setVideoLayerFrame(FloatRect(0, 0, bounds.size.width, bounds.size.height));
</del><ins>+
+ if (![_avPlayerController delegate] || !_avPlayerViewController)
+ return;
+
+ UIView* rootView = [[_avPlayerViewController parentViewController] view];
+ if (!rootView)
+ return;
+
+ FloatRect rootBounds = [rootView bounds];
+ [_avPlayerController delegate]->setVideoLayerFrame(rootBounds);
+
+ FloatRect sourceBounds = largestRectWithAspectRatioInsideRect(CGRectGetWidth(bounds) / CGRectGetHeight(bounds), rootBounds);
+ CATransform3D transform = CATransform3DMakeScale(bounds.size.width / sourceBounds.width(), bounds.size.height / sourceBounds.height(), 1);
+ transform = CATransform3DTranslate(transform, bounds.origin.x - sourceBounds.x(), bounds.origin.y - sourceBounds.y(), 0);
+ [self setSublayerTransform:transform];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setVideoLayerGravity:(AVVideoLayerGravity)videoLayerGravity
</span><span class="lines">@@ -635,6 +666,10 @@
</span><span class="cx"> m_videoLayer = &videoLayer;
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><ins>+
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
+
</ins><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><span class="cx">
</span><span class="cx"> m_videoLayerContainer = [WebAVVideoLayer videoLayer];
</span><span class="lines">@@ -647,6 +682,7 @@
</span><span class="cx"> m_playerViewController = adoptNS([[classAVPlayerViewController alloc] initWithVideoLayer:m_videoLayerContainer.get()]);
</span><span class="cx"> [m_playerViewController setPlayerController:(AVPlayerController *)playerController()];
</span><span class="cx"> [m_playerViewController setDelegate:playerController()];
</span><ins>+ [m_videoLayerContainer setPlayerViewController:m_playerViewController.get()];
</ins><span class="cx">
</span><span class="cx"> m_viewController = adoptNS([[classUIViewController alloc] init]);
</span><span class="cx">
</span><span class="lines">@@ -671,6 +707,8 @@
</span><span class="cx"> }];
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ [CATransaction commit];
+
</ins><span class="cx"> protect.clear();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -683,6 +721,8 @@
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [m_playerViewController view].frame = finalRect;
</span><ins>+ if ([m_videoLayerContainer videoLayerGravity] != AVVideoLayerGravityResizeAspect)
+ [m_videoLayerContainer setVideoLayerGravity:AVVideoLayerGravityResizeAspect];
</ins><span class="cx"> [m_playerViewController exitFullScreenWithCompletionHandler:^(BOOL, NSError*){
</span><span class="cx"> [m_window setHidden:YES];
</span><span class="cx"> [m_window setRootViewController:nil];
</span><span class="lines">@@ -694,6 +734,7 @@
</span><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><span class="cx"> m_videoLayer = nil;
</span><span class="cx"> [m_videoLayerContainer removeFromSuperlayer];
</span><ins>+ [m_videoLayerContainer setPlayerViewController:nil];
</ins><span class="cx"> m_videoLayerContainer = nil;
</span><span class="cx">
</span><span class="cx"> if (m_fullscreenChangeObserver)
</span></span></pre>
</div>
</div>
</body>
</html>