<!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>[200778] trunk</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/200778">200778</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-12 10:53:38 -0700 (Thu, 12 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjust "main content" video heuristic
https://bugs.webkit.org/show_bug.cgi?id=157532
Source/WebCore:
<rdar://problem/25840861>
Reviewed by Darin Adler.
Test: media/video-main-content-autoplay.html, plus existing tests updated.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::canControlControlsManager): Use isElementLargeEnoughForMainContent.
(WebCore::isMainContent): Ditto.
(WebCore::isElementLargeEnoughForMainContent): Check video area and aspect ratio.
(WebCore::MediaElementSession::mainContentCheckTimerFired): Call result.setToNonUserAgentShadowAncestor
so it doesn't hit test the video controls in the shadow DOM.
LayoutTests:
Reviewed by Darin Adler.
* media/video-main-content-allow.html:
* media/video-main-content-autoplay-expected.txt: Added.
* media/video-main-content-autoplay.html: Added.
* media/video-main-content-deny-too-small.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideomaincontentallowhtml">trunk/LayoutTests/media/video-main-content-allow.html</a></li>
<li><a href="#trunkLayoutTestsmediavideomaincontentdenytoosmallhtml">trunk/LayoutTests/media/video-main-content-deny-too-small.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideomaincontentautoplayexpectedtxt">trunk/LayoutTests/media/video-main-content-autoplay-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideomaincontentautoplayhtml">trunk/LayoutTests/media/video-main-content-autoplay.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200777 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-12 17:01:41 UTC (rev 200777)
+++ trunk/LayoutTests/ChangeLog 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-12 Eric Carlson <eric.carlson@apple.com>
+
+ Adjust "main content" video heuristic
+ https://bugs.webkit.org/show_bug.cgi?id=157532
+
+ Reviewed by Darin Adler.
+
+ * media/video-main-content-allow.html:
+ * media/video-main-content-autoplay-expected.txt: Added.
+ * media/video-main-content-autoplay.html: Added.
+ * media/video-main-content-deny-too-small.html:
+
</ins><span class="cx"> 2016-05-12 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Correctly handle prefixed and unprefixed variants in CSSStyleDeclaration
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideomaincontentallowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-main-content-allow.html (200777 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-main-content-allow.html 2016-05-12 17:01:41 UTC (rev 200777)
+++ trunk/LayoutTests/media/video-main-content-allow.html 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx"> </script>
</span><span class="cx"> <style>
</span><span class="cx"> video {
</span><del>- width: 600px;
- height: 400px;
</del><ins>+ width: 270px;
+ height: 480px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideomaincontentautoplayexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-main-content-autoplay-expected.txt (0 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-main-content-autoplay-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-main-content-autoplay-expected.txt 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+RUN(smallVideo.setAttribute('controls','controls'))
+RUN(smallVideo.setAttribute('autoplay','autoplay'))
+RUN(smallVideo.setAttribute('id','small'))
+RUN(document.body.appendChild(smallVideo))
+
+RUN(largeVideo.setAttribute('controls','controls'))
+RUN(largeVideo.setAttribute('autoplay','autoplay'))
+RUN(largeVideo.setAttribute('id','large'))
+RUN(document.body.appendChild(largeVideo))
+
+Large video auto-played, small video did not. OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideomaincontentautoplayhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-main-content-autoplay.html (0 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-main-content-autoplay.html (rev 0)
+++ trunk/LayoutTests/media/video-main-content-autoplay.html 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>video-main-content-size-check</title>
+ <script src="video-test.js"></script>
+ <script src="media-file.js"></script>
+ <script>
+ var smallVideo;
+ var largeVideo;
+ var counter = 0;
+
+ function maybeEndTest()
+ {
+ if (++counter < 2)
+ return;
+
+ logResult(true, 'Large video auto-played, small video did not.');
+ endTest();
+ }
+
+ function playing(event)
+ {
+ if (event.target == smallVideo)
+ failTest('Small video should not autoplay.');
+ else
+ maybeEndTest();
+ }
+
+ function canPlayThrough(event)
+ {
+ if (event.target == smallVideo)
+ setTimeout(maybeEndTest, 100);
+ }
+
+ function go()
+ {
+ smallVideo = document.createElement('video');
+ internals.setMediaElementRestrictions(smallVideo, "RequireUserGestureForVideoRateChange,OverrideUserGestureRequirementForMainContent");
+ run("smallVideo.setAttribute('controls','controls')");
+ run("smallVideo.setAttribute('autoplay','autoplay')");
+ run("smallVideo.setAttribute('id','small')");
+ smallVideo.addEventListener('canplaythrough', canPlayThrough, true);
+ smallVideo.addEventListener('playing', playing, true);
+ run("document.body.appendChild(smallVideo)");
+
+ consoleWrite("");
+ largeVideo = document.createElement('video');
+ internals.setMediaElementRestrictions(largeVideo, "RequireUserGestureForVideoRateChange,OverrideUserGestureRequirementForMainContent");
+ run("largeVideo.setAttribute('controls','controls')");
+ run("largeVideo.setAttribute('autoplay','autoplay')");
+ run("largeVideo.setAttribute('id','large')");
+ largeVideo.addEventListener('canplaythrough', canPlayThrough, true);
+ largeVideo.addEventListener('playing', playing, true);
+ run("document.body.appendChild(largeVideo)");
+
+ consoleWrite("");
+ smallVideo.src = findMediaFile('video', 'content/test');
+ largeVideo.src = findMediaFile('video', 'content/test');
+ }
+
+ </script>
+ <style>
+ #large {
+ width: 270px;
+ height: 480px;
+ }
+ #small {
+ width: 400;
+ height: 240;
+ }
+ </style>
+ </head>
+ <body onload="go()">
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideomaincontentdenytoosmallhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-main-content-deny-too-small.html (200777 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-main-content-deny-too-small.html 2016-05-12 17:01:41 UTC (rev 200777)
+++ trunk/LayoutTests/media/video-main-content-deny-too-small.html 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> <script>
</span><span class="cx"> function go() {
</span><span class="cx"> video = document.createElement('video');
</span><ins>+ video.controls = ""
</ins><span class="cx"> run('internals.setMediaElementRestrictions(video, "RequireUserGestureForVideoRateChange,OverrideUserGestureRequirementForMainContent")');
</span><span class="cx"> document.body.appendChild(video);
</span><span class="cx">
</span><span class="lines">@@ -27,8 +28,8 @@
</span><span class="cx"> </script>
</span><span class="cx"> <style>
</span><span class="cx"> video {
</span><del>- width: 200px;
- height: 100px;
</del><ins>+ width: 400px;
+ height: 299px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200777 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-12 17:01:41 UTC (rev 200777)
+++ trunk/Source/WebCore/ChangeLog 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-12 Eric Carlson <eric.carlson@apple.com>
+
+ Adjust "main content" video heuristic
+ https://bugs.webkit.org/show_bug.cgi?id=157532
+ <rdar://problem/25840861>
+
+ Reviewed by Darin Adler.
+
+ Test: media/video-main-content-autoplay.html, plus existing tests updated.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::canControlControlsManager): Use isElementLargeEnoughForMainContent.
+ (WebCore::isMainContent): Ditto.
+ (WebCore::isElementLargeEnoughForMainContent): Check video area and aspect ratio.
+ (WebCore::MediaElementSession::mainContentCheckTimerFired): Call result.setToNonUserAgentShadowAncestor
+ so it doesn't hit test the video controls in the shadow DOM.
+
</ins><span class="cx"> 2016-05-12 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [curl] ASSERTION FAILED: isLocalFile() || url == m_string in fast/dom/34176.html
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (200777 => 200778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-12 17:01:41 UTC (rev 200777)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-12 17:53:38 UTC (rev 200778)
</span><span class="lines">@@ -54,11 +54,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const int elementMainContentMinimumWidth = 400;
-static const int elementMainContentMinimumHeight = 300;
</del><span class="cx"> static const double elementMainContentCheckInterval = .250;
</span><span class="cx">
</span><span class="cx"> static bool isMainContent(const HTMLMediaElement&);
</span><ins>+static bool isElementLargeEnoughForMainContent(const HTMLMediaElement&);
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static String restrictionName(MediaElementSession::BehaviorRestrictions restriction)
</span><span class="lines">@@ -224,8 +223,8 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (element.hasVideo() && renderer->clientWidth() >= elementMainContentMinimumWidth && renderer->clientHeight() >= elementMainContentMinimumHeight)
- return true;
</del><ins>+ if (isElementLargeEnoughForMainContent(element))
+ return true;
</ins><span class="cx">
</span><span class="cx"> if (ScriptController::processingUserGestureForMedia())
</span><span class="cx"> return true;
</span><span class="lines">@@ -506,8 +505,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (renderer->clientWidth() < elementMainContentMinimumWidth
- || renderer->clientHeight() < elementMainContentMinimumHeight)
</del><ins>+ if (!isElementLargeEnoughForMainContent(element))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Elements which are hidden by style, or have been scrolled out of view, cannot be main content.
</span><span class="lines">@@ -539,6 +537,7 @@
</span><span class="cx">
</span><span class="cx"> // Elements which are obscured by other elements cannot be main content.
</span><span class="cx"> mainRenderView.hitTest(request, result);
</span><ins>+ result.setToNonUserAgentShadowAncestor();
</ins><span class="cx"> Element* hitElement = result.innerElement();
</span><span class="cx"> if (hitElement != &element)
</span><span class="cx"> return false;
</span><span class="lines">@@ -546,6 +545,24 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isElementLargeEnoughForMainContent(const HTMLMediaElement& element)
+{
+ static const double elementMainContentAreaMinimum = 400 * 300;
+ static const double maximumAspectRatio = 1.8; // Slightly larger than 16:9.
+ static const double minimumAspectRatio = .5; // Slightly smaller than 16:9.
+
+ // Elements which have not yet been laid out, or which are not yet in the DOM, cannot be main content.
+ RenderBox* renderer = downcast<RenderBox>(element.renderer());
+ if (!renderer)
+ return false;
+
+ double width = renderer->clientWidth();
+ double height = renderer->clientHeight();
+ double area = width * height;
+ double aspectRatio = width / height;
+ return area >= elementMainContentAreaMinimum && aspectRatio >= minimumAspectRatio && aspectRatio <= maximumAspectRatio;
+}
+
</ins><span class="cx"> void MediaElementSession::mainContentCheckTimerFired()
</span><span class="cx"> {
</span><span class="cx"> if (!hasBehaviorRestriction(OverrideUserGestureRequirementForMainContent))
</span></span></pre>
</div>
</div>
</body>
</html>