<!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>[187262] 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/187262">187262</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 15:23:28 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Relax media playback restrictions if the allowsMediaDocumentInlinePlayback property is set.
https://bugs.webkit.org/show_bug.cgi?id=147234
Reviewed by Darin Adler.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::prepareForLoad): Moved restriction check into MediaElementSession.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::playbackPermitted): Check if is a top-level media document and if
allowsMediaDocumentInilnePlayback is set, and return early.
(WebCore::MediaElementSession::effectivePreloadForElement): Ditto.
(WebCore::MediaElementSession::allowsAutomaticMediaDataLoading): Ditto.
* html/MediaElementSession.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessionh">trunk/Source/WebCore/html/MediaElementSession.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187261 => 187262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-23 22:19:31 UTC (rev 187261)
+++ trunk/Source/WebCore/ChangeLog 2015-07-23 22:23:28 UTC (rev 187262)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-23 Jer Noble <jer.noble@apple.com>
+
+ Relax media playback restrictions if the allowsMediaDocumentInlinePlayback property is set.
+ https://bugs.webkit.org/show_bug.cgi?id=147234
+
+ Reviewed by Darin Adler.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::prepareForLoad): Moved restriction check into MediaElementSession.
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::playbackPermitted): Check if is a top-level media document and if
+ allowsMediaDocumentInilnePlayback is set, and return early.
+ (WebCore::MediaElementSession::effectivePreloadForElement): Ditto.
+ (WebCore::MediaElementSession::allowsAutomaticMediaDataLoading): Ditto.
+ * html/MediaElementSession.h:
+
</ins><span class="cx"> 2015-07-23 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Bridged passing lists of devices between the UIProcess and the WebProcess
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (187261 => 187262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-23 22:19:31 UTC (rev 187261)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-23 22:23:28 UTC (rev 187262)
</span><span class="lines">@@ -1042,8 +1042,7 @@
</span><span class="cx"> setShouldDelayLoadEvent(true);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- Settings* settings = document().settings();
- if (effectivePreload != MediaPlayer::None && settings && settings->mediaDataLoadsAutomatically())
</del><ins>+ if (effectivePreload != MediaPlayer::None && m_mediaSession->allowsAutomaticMediaDataLoading(*this))
</ins><span class="cx"> prepareToPlay();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (187261 => 187262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2015-07-23 22:19:31 UTC (rev 187261)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2015-07-23 22:23:28 UTC (rev 187262)
</span><span class="lines">@@ -78,6 +78,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static bool pageExplicitlyAllowsElementToAutoplayInline(const HTMLMediaElement& element)
+{
+ Document& document = element.document();
+ Page* page = document.page();
+ return document.isMediaDocument() && !document.ownerElement() && page && page->allowsMediaDocumentInlinePlayback();
+}
+
</ins><span class="cx"> MediaElementSession::MediaElementSession(PlatformMediaSessionClient& client)
</span><span class="cx"> : PlatformMediaSession(client)
</span><span class="cx"> , m_restrictions(NoRestrictions)
</span><span class="lines">@@ -119,6 +126,9 @@
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::playbackPermitted(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><ins>+ if (pageExplicitlyAllowsElementToAutoplayInline(element))
+ return true;
+
</ins><span class="cx"> if (m_restrictions & RequireUserGestureForRateChange && !ScriptController::processingUserGesture()) {
</span><span class="cx"> LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE");
</span><span class="cx"> return false;
</span><span class="lines">@@ -331,6 +341,9 @@
</span><span class="cx"> PlatformMediaSessionManager::SessionRestrictions restrictions = PlatformMediaSessionManager::sharedManager().restrictions(mediaType());
</span><span class="cx"> MediaPlayer::Preload preload = element.preloadValue();
</span><span class="cx">
</span><ins>+ if (pageExplicitlyAllowsElementToAutoplayInline(element))
+ return preload;
+
</ins><span class="cx"> if ((restrictions & PlatformMediaSessionManager::MetadataPreloadingNotPermitted) == PlatformMediaSessionManager::MetadataPreloadingNotPermitted)
</span><span class="cx"> return MediaPlayer::None;
</span><span class="cx">
</span><span class="lines">@@ -344,8 +357,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::requiresFullscreenForVideoPlayback(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><del>- Page* page = element.document().page();
- if (element.document().isMediaDocument() && !element.document().ownerElement() && page && page->allowsMediaDocumentInlinePlayback())
</del><ins>+ if (pageExplicitlyAllowsElementToAutoplayInline(element))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!PlatformMediaSessionManager::sharedManager().sessionRestrictsInlineVideoPlayback(*this))
</span><span class="lines">@@ -366,6 +378,18 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaElementSession::allowsAutomaticMediaDataLoading(const HTMLMediaElement& element) const
+{
+ if (pageExplicitlyAllowsElementToAutoplayInline(element))
+ return true;
+
+ Settings* settings = element.document().settings();
+ if (settings && settings->mediaDataLoadsAutomatically())
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> void MediaElementSession::mediaEngineUpdated(const HTMLMediaElement& element)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaElementSession::mediaEngineUpdated");
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.h (187261 => 187262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.h 2015-07-23 22:19:31 UTC (rev 187261)
+++ trunk/Source/WebCore/html/MediaElementSession.h 2015-07-23 22:23:28 UTC (rev 187262)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> bool requiresFullscreenForVideoPlayback(const HTMLMediaElement&) const;
</span><span class="cx"> WEBCORE_EXPORT bool allowsPictureInPicture(const HTMLMediaElement&) const;
</span><span class="cx"> MediaPlayer::Preload effectivePreloadForElement(const HTMLMediaElement&) const;
</span><ins>+ bool allowsAutomaticMediaDataLoading(const HTMLMediaElement&) const;
</ins><span class="cx">
</span><span class="cx"> void mediaEngineUpdated(const HTMLMediaElement&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>