<!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>[187183] 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/187183">187183</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-22 14:31:39 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix fullscreen and PiP video animation and sizing regressions.
https://bugs.webkit.org/show_bug.cgi?id=147189
<rdar://problem/21930899>
Patch by Jeremy Jones <jeremyj@apple.com> on 2015-07-22
Reviewed by Jer Noble.
Fixes WK1 specific regressions introduced by <a href="http://trac.webkit.org/projects/webkit/changeset/187044">r187044</a>. Flicker when entering fullscreen,
wrong animation and missing initial animation rects.
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(elementRectInWindow): Added.
(WebVideoFullscreenControllerContext::didSetupFullscreen): Clear background decreases flash.
(WebVideoFullscreenControllerContext::fullscreenMayReturnToInline): Use consistent inline rect.
(WebVideoFullscreenControllerContext::setVideoLayerFrame):
Clear the transform on the web thread instead of on the UI thread.
(WebVideoFullscreenControllerContext::setUpFullscreen): Use consistent inline rect.
(WebVideoFullscreenControllerContext::exitFullscreen): Use consistent inline rect.
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(-[WebAVPlayerLayer resolveBounds]): Clear transform after setting frame.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</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 (187182 => 187183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-22 21:29:16 UTC (rev 187182)
+++ trunk/Source/WebCore/ChangeLog 2015-07-22 21:31:39 UTC (rev 187183)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-07-22 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><ins>+ Fix fullscreen and PiP video animation and sizing regressions.
+ https://bugs.webkit.org/show_bug.cgi?id=147189
+ <rdar://problem/21930899>
+
+ Reviewed by Jer Noble.
+
+ Fixes WK1 specific regressions introduced by r187044. Flicker when entering fullscreen,
+ wrong animation and missing initial animation rects.
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (elementRectInWindow): Added.
+ (WebVideoFullscreenControllerContext::didSetupFullscreen): Clear background decreases flash.
+ (WebVideoFullscreenControllerContext::fullscreenMayReturnToInline): Use consistent inline rect.
+ (WebVideoFullscreenControllerContext::setVideoLayerFrame):
+ Clear the transform on the web thread instead of on the UI thread.
+ (WebVideoFullscreenControllerContext::setUpFullscreen): Use consistent inline rect.
+ (WebVideoFullscreenControllerContext::exitFullscreen): Use consistent inline rect.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVPlayerLayer resolveBounds]): Clear transform after setting frame.
+
+2015-07-22 Jeremy Jones <jeremyj@apple.com>
+
</ins><span class="cx"> Adopt AVKit's AVSimplePlayerLayerView change for PiP.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147186
</span><span class="cx"> <rdar://problem/21928170>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (187182 => 187183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-07-22 21:29:16 UTC (rev 187182)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-07-22 21:31:39 UTC (rev 187183)
</span><span class="lines">@@ -36,7 +36,9 @@
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx"> #import "WebVideoFullscreenModelVideoElement.h"
</span><span class="cx"> #import <QuartzCore/CoreAnimation.h>
</span><ins>+#import <WebCore/FrameView.h>
</ins><span class="cx"> #import <WebCore/HTMLVideoElement.h>
</span><ins>+#import <WebCore/RenderElement.h>
</ins><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="lines">@@ -44,6 +46,14 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+static IntRect elementRectInWindow(HTMLVideoElement* videoElement)
+{
+ if (!videoElement || !videoElement->renderer() || !videoElement->document().view())
+ return IntRect();
+
+ return videoElement->document().view()->convertToContainingWindow(videoElement->renderer()->absoluteBoundingBoxRect());
+}
+
</ins><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
</span><span class="cx">
</span><span class="cx"> @implementation WebVideoFullscreenController
</span><span class="lines">@@ -154,6 +164,7 @@
</span><span class="cx"> RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
</span><span class="cx"> RetainPtr<CALayer> videoFullscreenLayer = [m_videoFullscreenView layer];
</span><span class="cx"> WebThreadRun([strongThis, this, videoFullscreenLayer] {
</span><ins>+ [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent, WebCore::ColorSpaceDeviceRGB)];
</ins><span class="cx"> m_model->setVideoFullscreenLayer(videoFullscreenLayer.get());
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), [strongThis, this] {
</span><span class="cx"> m_interface->enterFullscreen();
</span><span class="lines">@@ -198,7 +209,7 @@
</span><span class="cx"> ASSERT(isUIThread());
</span><span class="cx"> RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
</span><span class="cx"> WebThreadRun([strongThis, this] {
</span><del>- IntRect clientRect = m_videoElement->clientRect();
</del><ins>+ IntRect clientRect = elementRectInWindow(m_videoElement.get());
</ins><span class="cx"> dispatch_async(dispatch_get_main_queue(), [strongThis, this, clientRect] {
</span><span class="cx"> m_interface->preparedToReturnToInline(true, clientRect);
</span><span class="cx"> });
</span><span class="lines">@@ -454,17 +465,21 @@
</span><span class="cx"> ASSERT(isUIThread());
</span><span class="cx"> RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
</span><span class="cx"> RetainPtr<CALayer> videoFullscreenLayer = [m_videoFullscreenView layer];
</span><ins>+
+ [videoFullscreenLayer setSublayerTransform:[videoFullscreenLayer transform]];
</ins><span class="cx">
</span><del>- mach_port_name_t fencePort = [[videoFullscreenLayer context] createFencePort];
-
- WebThreadRun([strongThis, this, frame, fencePort, videoFullscreenLayer] {
- [CATransaction begin];
- [CATransaction setAnimationDuration:0];
- if (m_model)
- m_model->setVideoLayerFrame(frame);
- [[videoFullscreenLayer context] setFencePort:fencePort];
- mach_port_deallocate(mach_task_self(), fencePort);
- [CATransaction commit];
</del><ins>+ dispatch_async(dispatch_get_main_queue(), ^{
+ WebThreadRun([strongThis, this, frame, videoFullscreenLayer] {
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
+ [CATransaction setAnimationDuration:0];
+
+ [videoFullscreenLayer setSublayerTransform:CATransform3DIdentity];
+
+ if (m_model)
+ m_model->setVideoLayerFrame(frame);
+ [CATransaction commit];
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -528,7 +543,10 @@
</span><span class="cx"> m_model->setVideoElement(m_videoElement.get());
</span><span class="cx">
</span><span class="cx"> bool allowsPictureInPicture = m_videoElement->mediaSession().allowsPictureInPicture(*m_videoElement.get());
</span><del>- IntRect videoElementClientRect = m_videoElement->clientRect();
</del><ins>+
+ IntRect videoElementClientRect = elementRectInWindow(m_videoElement.get());
+ FloatRect videoLayerFrame = FloatRect(FloatPoint(), videoElementClientRect.size());
+ m_model->setVideoLayerFrame(videoLayerFrame);
</ins><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), [strongThis, this, videoElementClientRect, viewRef, mode, allowsPictureInPicture] {
</span><span class="cx"> m_interface->setupFullscreen(*m_videoFullscreenView.get(), videoElementClientRect, viewRef.get(), mode, allowsPictureInPicture);
</span><span class="lines">@@ -539,11 +557,11 @@
</span><span class="cx"> void WebVideoFullscreenControllerContext::exitFullscreen()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent() || isMainThread());
</span><del>- IntRect screenRect = m_videoElement->screenRect();
</del><ins>+ IntRect clientRect = elementRectInWindow(m_videoElement.get());
</ins><span class="cx"> RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
</span><del>- dispatch_async(dispatch_get_main_queue(), [strongThis, this, screenRect] {
</del><ins>+ dispatch_async(dispatch_get_main_queue(), [strongThis, this, clientRect] {
</ins><span class="cx"> ASSERT(isUIThread());
</span><del>- m_interface->exitFullscreen(screenRect);
</del><ins>+ m_interface->exitFullscreen(clientRect);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (187182 => 187183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-07-22 21:29:16 UTC (rev 187182)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-07-22 21:31:39 UTC (rev 187183)
</span><span class="lines">@@ -682,10 +682,11 @@
</span><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setAnimationDuration:0];
</span><ins>+ [CATransaction setDisableActions:YES];
</ins><span class="cx">
</span><del>- [(UIView *)[_videoSublayer delegate] setTransform:CGAffineTransformIdentity];
</del><span class="cx"> self.modelVideoLayerFrame = [self bounds];
</span><span class="cx"> [_avPlayerController delegate]->setVideoLayerFrame(self.modelVideoLayerFrame);
</span><ins>+ [(UIView *)[_videoSublayer delegate] setTransform:CGAffineTransformIdentity];
</ins><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>