<!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>[164161] 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/164161">164161</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-15 00:25:25 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK2 AVKit enter fullscreen doesn't work a second time.
https://bugs.webkit.org/show_bug.cgi?id=128558
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-02-15
Reviewed by Jer Noble.
Lazily create WebAVPlayerController when needed.
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::WebVideoFullscreenInterfaceAVKit):
(WebVideoFullscreenInterfaceAVKit::getPlayerController):
Add getPlayerController()
(WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel):
(WebVideoFullscreenInterfaceAVKit::setDuration):
(WebVideoFullscreenInterfaceAVKit::setCurrentTime):
(WebVideoFullscreenInterfaceAVKit::setRate):
(WebVideoFullscreenInterfaceAVKit::setVideoDimensions):
(WebVideoFullscreenInterfaceAVKit::setVideoLayer):
(WebVideoFullscreenInterfaceAVKit::enterFullscreenWithCompletionHandler):
use getPlayerController();</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.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 (164160 => 164161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-02-15 08:23:53 UTC (rev 164160)
+++ trunk/Source/WebCore/ChangeLog        2014-02-15 08:25:25 UTC (rev 164161)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-15 Jeremy Jones <jeremyj@apple.com>
+
+ WK2 AVKit enter fullscreen doesn't work a second time.
+ https://bugs.webkit.org/show_bug.cgi?id=128558
+
+ Reviewed by Jer Noble.
+
+ Lazily create WebAVPlayerController when needed.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::WebVideoFullscreenInterfaceAVKit):
+ (WebVideoFullscreenInterfaceAVKit::getPlayerController):
+ Add getPlayerController()
+
+ (WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel):
+ (WebVideoFullscreenInterfaceAVKit::setDuration):
+ (WebVideoFullscreenInterfaceAVKit::setCurrentTime):
+ (WebVideoFullscreenInterfaceAVKit::setRate):
+ (WebVideoFullscreenInterfaceAVKit::setVideoDimensions):
+ (WebVideoFullscreenInterfaceAVKit::setVideoLayer):
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreenWithCompletionHandler):
+ use getPlayerController();
+
</ins><span class="cx"> 2014-02-15 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] 10X slower than Chrome when drawing a video into a canvas
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (164160 => 164161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h        2014-02-15 08:23:53 UTC (rev 164160)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h        2014-02-15 08:25:25 UTC (rev 164161)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> RetainPtr<UIViewController> m_viewController;
</span><span class="cx"> RetainPtr<UIWindow> m_window;
</span><span class="cx"> WebVideoFullscreenModel* m_videoFullscreenModel;
</span><ins>+
+ WebAVPlayerController *playerController();
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> WebVideoFullscreenInterfaceAVKit();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (164160 => 164161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm        2014-02-15 08:23:53 UTC (rev 164160)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm        2014-02-15 08:25:25 UTC (rev 164161)
</span><span class="lines">@@ -214,19 +214,30 @@
</span><span class="cx"> initAVValueTiming();
</span><span class="cx"> initUIViewController();
</span><span class="cx"> initAVPlayerLayer();
</span><ins>+}
+
+WebAVPlayerController *WebVideoFullscreenInterfaceAVKit::playerController()
+{
+ if (!m_playerController)
+ {
+ m_playerController = adoptNS([[WebAVPlayerController alloc] init]);
+ if (m_videoFullscreenModel)
+ m_playerController.get().delegate = m_videoFullscreenModel;
+ }
</ins><span class="cx">
</span><del>- m_playerController = adoptNS([[WebAVPlayerController alloc] init]);
</del><ins>+ return m_playerController.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel(WebVideoFullscreenModel* model)
</span><span class="cx"> {
</span><span class="cx"> m_videoFullscreenModel = model;
</span><del>- m_playerController.get().delegate = m_videoFullscreenModel;
</del><ins>+ playerController().delegate = m_videoFullscreenModel;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setDuration(double duration)
</span><span class="cx"> {
</span><del>- WebAVPlayerController* playerController = m_playerController.get();
</del><ins>+ WebAVPlayerController* playerController = this->playerController();
</ins><span class="cx">
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=127017 use correct values instead of duration for all these
</span><span class="cx"> playerController.contentDuration = duration;
</span><span class="lines">@@ -246,31 +257,31 @@
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setCurrentTime(double currentTime, double anchorTime)
</span><span class="cx"> {
</span><del>- NSTimeInterval anchorTimeStamp = ![m_playerController rate] ? NAN : anchorTime;
</del><ins>+ NSTimeInterval anchorTimeStamp = ![playerController() rate] ? NAN : anchorTime;
</ins><span class="cx"> AVValueTiming *timing = [classAVValueTiming valueTimingWithAnchorValue:currentTime
</span><span class="cx"> anchorTimeStamp:anchorTimeStamp rate:0];
</span><del>- m_playerController.get().timing = timing;
</del><ins>+ playerController().timing = timing;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setRate(bool isPlaying, float playbackRate)
</span><span class="cx"> {
</span><del>- m_playerController.get().rate = isPlaying ? playbackRate : 0.;
</del><ins>+ playerController().rate = isPlaying ? playbackRate : 0.;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setVideoDimensions(bool hasVideo, float width, float height)
</span><span class="cx"> {
</span><del>- m_playerController.get().hasEnabledVideo = hasVideo;
- m_playerController.get().contentDimensions = CGSizeMake(width, height);
</del><ins>+ playerController().hasEnabledVideo = hasVideo;
+ playerController().contentDimensions = CGSizeMake(width, height);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setVideoLayer(PlatformLayer* videoLayer)
</span><span class="cx"> {
</span><del>- [m_playerController.get().playerLayer removeFromSuperlayer];
</del><ins>+ [playerController().playerLayer removeFromSuperlayer];
</ins><span class="cx"> [videoLayer removeFromSuperlayer];
</span><span class="cx"> ASSERT(!videoLayer
</span><span class="cx"> || [videoLayer isKindOfClass:[classAVPlayerLayer class]]
</span><span class="cx"> || ([videoLayer isKindOfClass:[CALayer class]] && [videoLayer conformsToProtocol:@protocol(AVPlayerLayer)]));
</span><del>- m_playerController.get().playerLayer = (CALayer<AVPlayerLayer>*)videoLayer;
</del><ins>+ playerController().playerLayer = (CALayer<AVPlayerLayer>*)videoLayer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::enterFullscreenWithCompletionHandler(std::function<void()> completion)
</span><span class="lines">@@ -279,10 +290,10 @@
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), [strongThis, completion]{
</span><span class="cx"> strongThis->m_playerViewController = [[[classAVPlayerViewController alloc] init] autorelease];
</span><del>- strongThis->m_playerViewController.get().playerController = (AVPlayerController *)strongThis->m_playerController.get();
</del><ins>+ strongThis->m_playerViewController.get().playerController = (AVPlayerController *)strongThis->playerController();
</ins><span class="cx">
</span><span class="cx"> if ([strongThis->m_playerViewController respondsToSelector:@selector(setDelegate:)])
</span><del>- strongThis->m_playerViewController.get().delegate = strongThis->m_playerController.get();
</del><ins>+ strongThis->m_playerViewController.get().delegate = strongThis->playerController();
</ins><span class="cx">
</span><span class="cx"> strongThis->m_viewController = adoptNS([[classUIViewController alloc] init]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>