<!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>[203219] 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/203219">203219</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-07-14 00:54:21 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/202918">r202918</a>): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
https://bugs.webkit.org/show_bug.cgi?id=159533
Reviewed by Eric Carlson.
Source/WebCore:
Move the contents of mainContentCheckTimerFired() into updateIsMainContent() so that the
results of changing the m_isMainContent ivar are acted upon no matter why m_isMainContent
changes.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::mainContentCheckTimerFired):
(WebCore::MediaElementSession::updateIsMainContent):
LayoutTests:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203218 => 203219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/LayoutTests/ChangeLog 2016-07-14 07:54:21 UTC (rev 203219)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-14 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION (r202918): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
+ https://bugs.webkit.org/show_bug.cgi?id=159533
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-07-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rebaseline test after r203204 and r203207.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (203218 => 203219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-07-14 07:54:21 UTC (rev 203219)
</span><span class="lines">@@ -1438,8 +1438,6 @@
</span><span class="cx"> # rdar://problem/27187013
</span><span class="cx"> [ Sierra+ ] fast/block/float/overhanging-tall-block.html [ Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/159533 [ ElCapitan+ ] media/video-main-content-allow-then-deny.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/151287 [ ElCapitan ] media/controls/inline-elements-dropoff-order.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/159683 imported/w3c/web-platform-tests/fetch/api/request/request-cache.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203218 => 203219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/Source/WebCore/ChangeLog 2016-07-14 07:54:21 UTC (rev 203219)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-14 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION (r202918): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
+ https://bugs.webkit.org/show_bug.cgi?id=159533
+
+ Reviewed by Eric Carlson.
+
+ Move the contents of mainContentCheckTimerFired() into updateIsMainContent() so that the
+ results of changing the m_isMainContent ivar are acted upon no matter why m_isMainContent
+ changes.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::mainContentCheckTimerFired):
+ (WebCore::MediaElementSession::updateIsMainContent):
+
</ins><span class="cx"> 2016-07-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Modernize WebSocket handle
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (203218 => 203219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-07-14 07:54:21 UTC (rev 203219)
</span><span class="lines">@@ -604,16 +604,18 @@
</span><span class="cx"> if (!hasBehaviorRestriction(OverrideUserGestureRequirementForMainContent))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ updateIsMainContent();
+}
+
+bool MediaElementSession::updateIsMainContent() const
+{
</ins><span class="cx"> bool wasMainContent = m_isMainContent;
</span><span class="cx"> m_isMainContent = isMainContent(m_element);
</span><span class="cx">
</span><span class="cx"> if (m_isMainContent != wasMainContent)
</span><span class="cx"> m_element.updateShouldPlay();
</span><del>-}
</del><span class="cx">
</span><del>-bool MediaElementSession::updateIsMainContent() const
-{
- return m_isMainContent = isMainContent(m_element);
</del><ins>+ return m_isMainContent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>