<!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>[200688] 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/200688">200688</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-05-11 09:20:20 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Videos allowed to play through the Main Content restriction should not pause when scrolled off-screen.
https://bugs.webkit.org/show_bug.cgi?id=157555
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/video-main-content-allow-then-scroll.html
* html/MediaElementSession.cpp:
(WebCore::isMainContent):
LayoutTests:
* media/video-main-content-allow-then-scroll-expected.txt: Added.
* media/video-main-content-allow-then-scroll.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkLayoutTestsmediavideomaincontentallowthenscrollexpectedtxt">trunk/LayoutTests/media/video-main-content-allow-then-scroll-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideomaincontentallowthenscrollhtml">trunk/LayoutTests/media/video-main-content-allow-then-scroll.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200687 => 200688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-11 16:18:41 UTC (rev 200687)
+++ trunk/LayoutTests/ChangeLog 2016-05-11 16:20:20 UTC (rev 200688)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-11 Jer Noble <jer.noble@apple.com>
+
+ Videos allowed to play through the Main Content restriction should not pause when scrolled off-screen.
+ https://bugs.webkit.org/show_bug.cgi?id=157555
+
+ Reviewed by Eric Carlson.
+
+ * media/video-main-content-allow-then-scroll-expected.txt: Added.
+ * media/video-main-content-allow-then-scroll.html: Added.
+
</ins><span class="cx"> 2016-05-11 Pranjal Jumde <pjumde@apple.com>
</span><span class="cx">
</span><span class="cx"> Sites served over insecure connections should not be allowed to use geolocation.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideomaincontentallowthenscrollexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-main-content-allow-then-scroll-expected.txt (0 => 200688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-main-content-allow-then-scroll-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-main-content-allow-then-scroll-expected.txt 2016-05-11 16:20:20 UTC (rev 200688)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+RUN(internals.setMediaElementRestrictions(video, "RequireUserGestureForVideoRateChange,OverrideUserGestureRequirementForMainContent"))
+EVENT(canplaythrough)
+EVENT(playing)
+RUN(document.body.scrollTop = document.body.clientHeight)
+EXPECTED (video.paused == 'false') OK
+END OF TEST
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideomaincontentallowthenscrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-main-content-allow-then-scroll.html (0 => 200688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-main-content-allow-then-scroll.html (rev 0)
+++ trunk/LayoutTests/media/video-main-content-allow-then-scroll.html 2016-05-11 16:20:20 UTC (rev 200688)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>video-main-content-allow</title>
+ <script src="video-test.js"></script>
+ <script src="media-file.js"></script>
+ <script>
+ function go() {
+ video = document.createElement('video');
+ run('internals.setMediaElementRestrictions(video, "RequireUserGestureForVideoRateChange,OverrideUserGestureRequirementForMainContent")');
+ document.body.appendChild(video);
+ var spacer = document.body.appendChild(document.createElement('div'));
+ spacer.id = 'spacer';
+
+ video.src = findMediaFile('video', 'content/test');
+ waitForEvent('canplaythrough', canPlayThrough);
+ }
+
+ function canPlayThrough() {
+ video.play();
+ waitForEvent('playing', playing);
+ }
+
+ function playing() {
+ run('document.body.scrollTop = document.body.clientHeight');
+ waitForEventAndFail('pause');
+ setTimeout(afterPlaying, 100);
+ }
+
+ function afterPlaying() {
+ testExpected('video.paused', false);
+ endTest();
+ }
+ </script>
+ <style>
+ html, body, #spacer {
+ height: 100%;
+ }
+ video {
+ width: 600px;
+ height: 400px;
+ }
+ </style>
+</head>
+<body onload="go()">
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200687 => 200688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-11 16:18:41 UTC (rev 200687)
+++ trunk/Source/WebCore/ChangeLog 2016-05-11 16:20:20 UTC (rev 200688)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-11 Jer Noble <jer.noble@apple.com>
+
+ Videos allowed to play through the Main Content restriction should not pause when scrolled off-screen.
+ https://bugs.webkit.org/show_bug.cgi?id=157555
+
+ Reviewed by Eric Carlson.
+
+ Test: media/video-main-content-allow-then-scroll.html
+
+ * html/MediaElementSession.cpp:
+ (WebCore::isMainContent):
+
</ins><span class="cx"> 2016-05-11 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [curl] curl_easy_setopt(CURLOPT_CONNECT_ONLY) should take a long parameter
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (200687 => 200688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-11 16:18:41 UTC (rev 200687)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-11 16:20:20 UTC (rev 200688)
</span><span class="lines">@@ -511,9 +511,13 @@
</span><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><ins>+ // But elements which have audio & video and are already playing should not stop playing because
+ // they are scrolled off the page.
</ins><span class="cx"> if (renderer->style().visibility() != VISIBLE
</span><del>- || renderer->visibleInViewportState() != RenderElement::VisibleInViewport)
</del><ins>+ || (renderer->visibleInViewportState() != RenderElement::VisibleInViewport && !element.isPlaying())
+ ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Main content elements must be in the main frame.
</span><span class="cx"> Document& document = element.document();
</span></span></pre>
</div>
</div>
</body>
</html>