<!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>[185834] 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/185834">185834</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-22 10:41:59 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not exit fullscreen when starting PiP since this is done automatically.
https://bugs.webkit.org/show_bug.cgi?id=144871
Patch by Jeremy Jones <jeremyj@apple.com> on 2015-06-22
Reviewed by Darin Adler.
Since we don't explicitly exit fullscreen, update state in shouldExitFullscreenWithReason()
* platform/ios/WebVideoFullscreenInterfaceAVKit.h: Declare shouldExitFullscreenWithReason().
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(-[WebAVPlayerController playerViewController:shouldExitFullScreenWithReason:]): Forward to WebVideoFullscreenInterfaceAVKit.
(WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason): Added.
(WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture): Remove enter fullscreen code.
* platform/spi/cocoa/AVKitSPI.h: Add missing enums.</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>
<li><a href="#trunkSourceWebCoreplatformspicocoaAVKitSPIh">trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185833 => 185834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-22 17:11:54 UTC (rev 185833)
+++ trunk/Source/WebCore/ChangeLog 2015-06-22 17:41:59 UTC (rev 185834)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-22 Jeremy Jones <jeremyj@apple.com>
+
+ Do not exit fullscreen when starting PiP since this is done automatically.
+ https://bugs.webkit.org/show_bug.cgi?id=144871
+
+ Reviewed by Darin Adler.
+
+ Since we don't explicitly exit fullscreen, update state in shouldExitFullscreenWithReason()
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h: Declare shouldExitFullscreenWithReason().
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVPlayerController playerViewController:shouldExitFullScreenWithReason:]): Forward to WebVideoFullscreenInterfaceAVKit.
+ (WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason): Added.
+ (WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture): Remove enter fullscreen code.
+ * platform/spi/cocoa/AVKitSPI.h: Add missing enums.
+
</ins><span class="cx"> 2015-06-22 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: UI Automation cannot find AutoFill or search cancel buttons
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (185833 => 185834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-06-22 17:11:54 UTC (rev 185833)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-06-22 17:41:59 UTC (rev 185834)
</span><span class="lines">@@ -99,6 +99,15 @@
</span><span class="cx"> WEBCORE_EXPORT virtual void requestHideAndExitFullscreen();
</span><span class="cx"> WEBCORE_EXPORT virtual void preparedToReturnToInline(bool visible, const IntRect& inlineRect);
</span><span class="cx">
</span><ins>+ enum class ExitFullScreenReason {
+ DoneButtonTapped,
+ FullScreenButtonTapped,
+ PinchGestureHandled,
+ RemoteControlStopEventReceived,
+ PictureInPictureStarted
+ };
+
+ bool shouldExitFullscreenWithReason(ExitFullScreenReason);
</ins><span class="cx"> HTMLMediaElementEnums::VideoFullscreenMode mode() const { return m_mode; }
</span><span class="cx"> bool allowsPictureInPicturePlayback() const { return m_allowsPictureInPicturePlayback; }
</span><span class="cx"> WEBCORE_EXPORT bool mayAutomaticallyShowVideoPictureInPicture() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (185833 => 185834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-06-22 17:11:54 UTC (rev 185833)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-06-22 17:41:59 UTC (rev 185834)
</span><span class="lines">@@ -222,18 +222,26 @@
</span><span class="cx"> self.fullscreenInterface->didStopPictureInPicture();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullScreenReason(AVPlayerViewControllerExitFullScreenReason reason)
+{
+ switch (reason) {
+ case AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped:
+ return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::DoneButtonTapped;
+ case AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped:
+ return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::FullScreenButtonTapped;
+ case AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted:
+ return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::PictureInPictureStarted;
+ case AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled:
+ return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::PinchGestureHandled;
+ case AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived:
+ return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::RemoteControlStopEventReceived;
+ }
+}
+
</ins><span class="cx"> - (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(playerViewController);
</span><del>- UNUSED_PARAM(reason);
- if (!self.delegate)
- return YES;
-
- if (reason == AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped || reason == AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived)
- self.delegate->pause();
-
- self.delegate->requestExitFullscreen();
- return NO;
</del><ins>+ return self.fullscreenInterface->shouldExitFullscreenWithReason(convertToExitFullScreenReason(reason));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler
</span><span class="lines">@@ -1145,30 +1153,6 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture(%p)", this);
</span><span class="cx"> setMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
</span><del>-
- if (!hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
- return;
-
- RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
- fullscreenMayReturnToInline([strongThis, this](bool visible) {
- LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture - lambda(%p) - visible(%s)", this, boolString(visible));
-
- if (!visible) {
- [m_window setHidden:YES];
- [[m_playerViewController view] setHidden:YES];
- return;
- }
-
- [[m_playerViewController view] layoutIfNeeded];
-
- [m_playerViewController exitFullScreenAnimated:YES completionHandler:[strongThis, this] (BOOL completed, NSError*) {
- if (!completed)
- return;
- clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
- [m_window setHidden:YES];
- [[m_playerViewController view] setHidden:YES];
- }];
- });
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::didStartPictureInPicture()
</span><span class="lines">@@ -1240,6 +1224,24 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason reason)
+{
+ if (!m_videoFullscreenModel)
+ return true;
+
+ if (reason == ExitFullScreenReason::PictureInPictureStarted) {
+ clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
+ return true;
+ }
+
+ if (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived)
+ m_videoFullscreenModel->pause();
+
+ m_videoFullscreenModel->requestExitFullscreen();
+
+ return false;
+}
+
</ins><span class="cx"> void WebVideoFullscreenInterfaceAVKit::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode | mode;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaAVKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (185833 => 185834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-06-22 17:11:54 UTC (rev 185833)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-06-22 17:41:59 UTC (rev 185834)
</span><span class="lines">@@ -74,8 +74,11 @@
</span><span class="cx"> @protocol AVPlayerViewControllerDelegate <NSObject>
</span><span class="cx"> @optional
</span><span class="cx"> typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
</span><del>- AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped = 0,
- AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived = 3,
</del><ins>+ AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped,
+ AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped,
+ AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled,
+ AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived,
+ AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted
</ins><span class="cx"> };
</span><span class="cx"> - (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;
</span><span class="cx"> - (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;
</span></span></pre>
</div>
</div>
</body>
</html>