<!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>[177039] trunk/Source</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/177039">177039</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-09 13:54:44 -0800 (Tue, 09 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable automatic optimized fullscreen mode.
https://bugs.webkit.org/show_bug.cgi?id=139437
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-12-09
Source/WebCore:
Reviewed by Eric Carlson.
Anticipate transition to optimized video fullscreen mode when entering background.
* WebCore.exp.in:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::overrideBackgroundPlaybackRestriction): Add logic for automatic transition detection.
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoOptimized): Add logic for automatic transition detection.
Source/WebKit2:
Reviewed by Simon Fraser.
Anticipate the automatic transition to optimized video fullscreen mode when deciding if the page is visible.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _isShowingVideoOptimized]): Renamed. Test precondition.
(-[WKWebView _mayAutomaticallyShowVideoOptimized]): Added.
(-[WKWebView _isPlayingFullscreenOptimizedVideo]): Deleted.
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::isViewVisible): Test for optimized modes even when not in a window.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebCore/ChangeLog 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-09 Jeremy Jones <jeremyj@apple.com>
+
+ Enable automatic optimized fullscreen mode.
+ https://bugs.webkit.org/show_bug.cgi?id=139437
+
+ Reviewed by Eric Carlson.
+
+ Anticipate transition to optimized video fullscreen mode when entering background.
+
+ * WebCore.exp.in:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::overrideBackgroundPlaybackRestriction): Add logic for automatic transition detection.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoOptimized): Add logic for automatic transition detection.
+
</ins><span class="cx"> 2014-12-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Delete Node::boundingBox()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -3507,6 +3507,7 @@
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit28requestHideAndExitFullscreenEv
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit29setAudioMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit31setLegibleMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
</span><ins>+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit34mayAutomaticallyShowVideoOptimizedEv
</ins><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -6073,7 +6073,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> if (m_videoFullscreenMode & VideoFullscreenModeOptimized)
</span><span class="cx"> return true;
</span><del>-
</del><ins>+#if PLATFORM(IOS)
+ if (m_videoFullscreenMode == VideoFullscreenModeStandard && wkIsOptimizedFullscreenSupported() && isPlaying())
+ return true;
+#endif
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement::VideoFullscreenMode mode() const { return m_mode; }
</span><span class="cx"> void setIsOptimized(bool);
</span><ins>+ bool mayAutomaticallyShowVideoOptimized();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "AVKitSPI.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "GeometryUtilities.h"
</span><ins>+#import "WebCoreSystemInterface.h"
</ins><span class="cx"> #import "WebVideoFullscreenModel.h"
</span><span class="cx"> #import <AVFoundation/AVTime.h>
</span><span class="cx"> #import <CoreMedia/CMTime.h>
</span><span class="lines">@@ -1114,4 +1115,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebVideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoOptimized()
+{
+ return [m_playerController isPlaying] && m_mode == HTMLMediaElement::VideoFullscreenModeStandard && wkIsOptimizedFullscreenSupported();
+}
+
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-09 Jeremy Jones <jeremyj@apple.com>
+
+ Enable automatic optimized fullscreen mode.
+ https://bugs.webkit.org/show_bug.cgi?id=139437
+
+ Reviewed by Simon Fraser.
+
+ Anticipate the automatic transition to optimized video fullscreen mode when deciding if the page is visible.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _isShowingVideoOptimized]): Renamed. Test precondition.
+ (-[WKWebView _mayAutomaticallyShowVideoOptimized]): Added.
+ (-[WKWebView _isPlayingFullscreenOptimizedVideo]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::isViewVisible): Test for optimized modes even when not in a window.
+
</ins><span class="cx"> 2014-12-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for clearing the disk cache
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -233,16 +233,22 @@
</span><span class="cx"> return deviceOrientationForUIInterfaceOrientation([[UIApplication sharedApplication] statusBarOrientation]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_isPlayingFullscreenOptimizedVideo
</del><ins>+- (BOOL)_isShowingVideoOptimized
</ins><span class="cx"> {
</span><del>- if (!_page->videoFullscreenManager())
</del><ins>+ if (!_page || !_page->videoFullscreenManager())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (_page->videoFullscreenManager()->mode() & WebCore::HTMLMediaElement::HTMLMediaElement::VideoFullscreenModeOptimized)
- return true;
-
- return false;
</del><ins>+ return _page->videoFullscreenManager()->mode() & WebCore::HTMLMediaElement::VideoFullscreenModeOptimized;
</ins><span class="cx"> }
</span><ins>+
+- (BOOL)_mayAutomaticallyShowVideoOptimized
+{
+ if (!_page || !_page->videoFullscreenManager())
+ return false;
+
+ return _page->videoFullscreenManager()->mayAutomaticallyShowVideoOptimized();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -95,7 +95,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
</span><span class="cx">
</span><del>-- (BOOL)_isPlayingFullscreenOptimizedVideo;
</del><ins>+- (BOOL)_isShowingVideoOptimized;
+- (BOOL)_mayAutomaticallyShowVideoOptimized;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) UIEdgeInsets _computedContentInset;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (177038 => 177039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-12-09 21:53:45 UTC (rev 177038)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-12-09 21:54:44 UTC (rev 177039)
</span><span class="lines">@@ -179,7 +179,16 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewVisible()
</span><span class="cx"> {
</span><del>- return isViewInWindow() && (!m_contentView.isBackground || [m_webView _isPlayingFullscreenOptimizedVideo]);
</del><ins>+ if (isViewInWindow() && !m_contentView.isBackground)
+ return true;
+
+ if ([m_webView _isShowingVideoOptimized])
+ return true;
+
+ if ([m_webView _mayAutomaticallyShowVideoOptimized])
+ return true;
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewInWindow()
</span></span></pre>
</div>
</div>
</body>
</html>