<!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>[201729] 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/201729">201729</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-06-06 14:47:05 -0700 (Mon, 06 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media elements should only be allowed to control controls manager during a user gesture.
https://bugs.webkit.org/show_bug.cgi?id=158432
Reviewed by Eric Carlson.
Add a new MediaElementSession behavior restriction for the controls manager
which is cleared on the first user gesture. Since canControlControlsManager()
may be called before the first layout, call updatePlaybackControlsManager()
since the main content check requires the laid-out size of the media element.
(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::layoutSizeChanged):
(WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture):
* html/HTMLMediaElement.h:
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::canControlControlsManager):
* 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="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</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 (201728 => 201729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-06 21:40:58 UTC (rev 201728)
+++ trunk/Source/WebCore/ChangeLog 2016-06-06 21:47:05 UTC (rev 201729)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-06 Jer Noble <jer.noble@apple.com>
+
+ Media elements should only be allowed to control controls manager during a user gesture.
+ https://bugs.webkit.org/show_bug.cgi?id=158432
+
+ Reviewed by Eric Carlson.
+
+ Add a new MediaElementSession behavior restriction for the controls manager
+ which is cleared on the first user gesture. Since canControlControlsManager()
+ may be called before the first layout, call updatePlaybackControlsManager()
+ since the main content check requires the laid-out size of the media element.
+
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ (WebCore::HTMLMediaElement::layoutSizeChanged):
+ (WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture):
+ * html/HTMLMediaElement.h:
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::canControlControlsManager):
+ * html/MediaElementSession.h:
+
</ins><span class="cx"> 2016-06-06 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Update MediaEndpointPeerConnection::createOffer() to use the transceiver set
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (201728 => 201729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-06-06 21:40:58 UTC (rev 201728)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-06-06 21:47:05 UTC (rev 201729)
</span><span class="lines">@@ -409,6 +409,7 @@
</span><span class="cx"> , m_parsingInProgress(createdByParser)
</span><span class="cx"> , m_elementIsHidden(document.hidden())
</span><span class="cx"> , m_creatingControls(false)
</span><ins>+ , m_receivedLayoutSizeChanged(false)
</ins><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> , m_mediaControlsDependOnPageScaleFactor(false)
</span><span class="cx"> , m_haveSetUpCaptionContainer(false)
</span><span class="lines">@@ -443,6 +444,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
</span><span class="cx"> #endif
</span><ins>+ m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureToControlControlsManager);
</ins><span class="cx">
</span><span class="cx"> Settings* settings = document.settings();
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -4001,6 +4003,11 @@
</span><span class="cx"> };
</span><span class="cx"> m_resizeTaskQueue.enqueueTask(WTFMove(task));
</span><span class="cx"> #endif
</span><ins>+
+ if (!m_receivedLayoutSizeChanged) {
+ m_receivedLayoutSizeChanged = true;
+ updatePlaybackControlsManager();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::visibilityDidChange()
</span><span class="lines">@@ -6404,7 +6411,8 @@
</span><span class="cx"> | MediaElementSession::RequireUserGestureForVideoRateChange
</span><span class="cx"> | MediaElementSession::RequireUserGestureForAudioRateChange
</span><span class="cx"> | MediaElementSession::RequireUserGestureForFullscreen
</span><del>- | MediaElementSession::InvisibleAutoplayNotPermitted;
</del><ins>+ | MediaElementSession::InvisibleAutoplayNotPermitted
+ | MediaElementSession::RequireUserGestureToControlControlsManager;
</ins><span class="cx"> m_mediaSession->removeBehaviorRestriction(restrictionsToRemove);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (201728 => 201729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-06-06 21:40:58 UTC (rev 201728)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-06-06 21:47:05 UTC (rev 201729)
</span><span class="lines">@@ -926,6 +926,7 @@
</span><span class="cx"> bool m_parsingInProgress : 1;
</span><span class="cx"> bool m_elementIsHidden : 1;
</span><span class="cx"> bool m_creatingControls : 1;
</span><ins>+ bool m_receivedLayoutSizeChanged : 1;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> bool m_mediaControlsDependOnPageScaleFactor : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (201728 => 201729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-06 21:40:58 UTC (rev 201728)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-06 21:47:05 UTC (rev 201729)
</span><span class="lines">@@ -214,31 +214,55 @@
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::canControlControlsManager(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><del>- if (!element.hasAudio())
</del><ins>+ if (!element.hasAudio()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No audio");
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (element.muted())
</del><ins>+ if (element.muted()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Muted");
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (element.ended())
</del><ins>+ if (element.ended()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Ended");
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (element.document().activeDOMObjectsAreSuspended())
</del><ins>+ if (element.document().activeDOMObjectsAreSuspended()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: activeDOMObjectsAreSuspended()");
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (!playbackPermitted(element))
</del><ins>+ if (!playbackPermitted(element)) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Playback not permitted");
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (!element.renderer())
- return false;
</del><ins>+ if (element.isVideo()) {
+ if (!element.renderer()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No renderer");
+ return false;
+ }
</ins><span class="cx">
</span><del>- if (isElementLargeEnoughForMainContent(element))
- return true;
</del><ins>+ if (!element.hasVideo()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No video");
+ return false;
+ }
</ins><span class="cx">
</span><del>- if (ScriptController::processingUserGestureForMedia())
- return true;
</del><ins>+ if (isElementLargeEnoughForMainContent(element)) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning TRUE: Is main content");
+ return true;
+ }
+ }
</ins><span class="cx">
</span><del>- return false;
</del><ins>+ if (m_restrictions & RequireUserGestureToControlControlsManager && !ScriptController::processingUserGestureForMedia()) {
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No user gesture");
+ return false;
+ }
+
+ LOG(Media, "MediaElementSession::canControlControlsManager - returning TRUE: All criteria met");
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.h (201728 => 201729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.h 2016-06-06 21:40:58 UTC (rev 201728)
+++ trunk/Source/WebCore/html/MediaElementSession.h 2016-06-06 21:47:05 UTC (rev 201729)
</span><span class="lines">@@ -94,7 +94,8 @@
</span><span class="cx"> MetadataPreloadingNotPermitted = 1 << 9,
</span><span class="cx"> AutoPreloadingNotPermitted = 1 << 10,
</span><span class="cx"> InvisibleAutoplayNotPermitted = 1 << 11,
</span><del>- OverrideUserGestureRequirementForMainContent = 1 << 12
</del><ins>+ OverrideUserGestureRequirementForMainContent = 1 << 12,
+ RequireUserGestureToControlControlsManager = 1 << 13,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned BehaviorRestrictions;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>