<!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>[210730] 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/210730">210730</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-13 06:26:17 -0800 (Fri, 13 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/210621">r210621</a>): [mac-wk2] LayoutTest fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html timing out
https://bugs.webkit.org/show_bug.cgi?id=166980
Source/WebCore:
Unreviewed, fix test broken by <a href="http://trac.webkit.org/projects/webkit/changeset/210621">r210621</a>.
No new tests, updated fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html
and results.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(-[WebAVSampleBufferStatusChangeListener observeValueForKeyPath:ofObject:change:context:]):
Drive-by fix: null-check parent.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::layerStatusDidChange): Do nothing if the layer
has changed since the KVO notification.
LayoutTests:
Unreviewed, fix test broken by <a href="http://trac.webkit.org/projects/webkit/changeset/210621">r210621</a>.
* fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt:
* fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html:
* platform/mac-wk2/TestExpectations: Un-skip fixed test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledthenenabledexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledthenenabledhtml">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210729 => 210730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-13 08:24:54 UTC (rev 210729)
+++ trunk/LayoutTests/ChangeLog 2017-01-13 14:26:17 UTC (rev 210730)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-13 Eric Carlson <eric.carlson@apple.com>
+
+ REGRESSION (r210621): [mac-wk2] LayoutTest fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html timing out
+ https://bugs.webkit.org/show_bug.cgi?id=166980
+
+ Unreviewed, fix test broken by r210621.
+
+ * fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt:
+ * fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html:
+ * platform/mac-wk2/TestExpectations: Un-skip fixed test.
+
</ins><span class="cx"> 2017-01-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Skip to test imported/w3c/web-platform-tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledthenenabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt (210729 => 210730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt 2017-01-13 08:24:54 UTC (rev 210729)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt 2017-01-13 14:26:17 UTC (rev 210730)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> video.src = window.URL.createObjectURL(mediaStream)
</span><span class="cx">
</span><span class="cx"> === beginning round of pixel tests ===
</span><del>-PASS pixel was white
</del><ins>+PASS pixel was black
</ins><span class="cx">
</span><span class="cx"> === all video tracks disabled ===
</span><span class="cx"> PASS pixel was black.
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> video.play()
</span><span class="cx">
</span><span class="cx"> === beginning round of pixel tests ===
</span><del>-PASS pixel was white
</del><ins>+PASS pixel was black
</ins><span class="cx">
</span><span class="cx"> === all video tracks disabled ===
</span><span class="cx"> PASS pixel was black.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledthenenabledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html (210729 => 210730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html 2017-01-13 08:24:54 UTC (rev 210729)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html 2017-01-13 14:26:17 UTC (rev 210730)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> let context;
</span><span class="cx"> let mediaStream;
</span><span class="cx"> let video;
</span><ins>+ let havePlayed = false;
</ins><span class="cx">
</span><span class="cx"> let buffer;
</span><span class="cx">
</span><span class="lines">@@ -57,6 +58,7 @@
</span><span class="cx"> evalAndLog('video.play()');
</span><span class="cx"> beginTestRound();
</span><span class="cx"> } else
</span><ins>+ video.pause();
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -81,7 +83,7 @@
</span><span class="cx"> context.drawImage(video, 0, 0, canvas.width, canvas.height);
</span><span class="cx"> buffer = context.getImageData(30, 242, 1, 1).data;
</span><span class="cx">
</span><del>- if (mediaStream.getVideoTracks()[0].enabled)
</del><ins>+ if (mediaStream.getVideoTracks()[0].enabled && havePlayed)
</ins><span class="cx"> return isPixelWhite(buffer);
</span><span class="cx"> else
</span><span class="cx"> return isPixelBlack(buffer);
</span><span class="lines">@@ -100,7 +102,7 @@
</span><span class="cx"> function beginTestRound()
</span><span class="cx"> {
</span><span class="cx"> debug('<br> === beginning round of pixel tests ===');
</span><del>- attempt(1, checkPixels, disableAllTracks, 'pixel was white');
</del><ins>+ attempt(1, checkPixels, disableAllTracks, 'pixel was black');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function canplay()
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (210729 => 210730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2017-01-13 08:24:54 UTC (rev 210729)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2017-01-13 14:26:17 UTC (rev 210730)
</span><span class="lines">@@ -611,5 +611,3 @@
</span><span class="cx"> webkit.org/b/166765 [ Debug ] http/tests/pointer-lock/iframe-sandboxed-nested-allow-pointer-lock.html [ Crash ]
</span><span class="cx"> webkit.org/b/166765 [ Debug ] http/tests/pointer-lock/pointerlockelement-same-origin.html [ Crash ]
</span><span class="cx"> webkit.org/b/166765 [ Debug ] pointer-lock/lock-lost-on-alert.html [ Crash ]
</span><del>-
-webkit.org/b/166980 fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html [ Timeout ]
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210729 => 210730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-13 08:24:54 UTC (rev 210729)
+++ trunk/Source/WebCore/ChangeLog 2017-01-13 14:26:17 UTC (rev 210730)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-13 Eric Carlson <eric.carlson@apple.com>
+
+ REGRESSION (r210621): [mac-wk2] LayoutTest fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html timing out
+ https://bugs.webkit.org/show_bug.cgi?id=166980
+
+ Unreviewed, fix test broken by r210621.
+
+ No new tests, updated fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html
+ and results.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (-[WebAVSampleBufferStatusChangeListener observeValueForKeyPath:ofObject:change:context:]):
+ Drive-by fix: null-check parent.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::layerStatusDidChange): Do nothing if the layer
+ has changed since the KVO notification.
+
</ins><span class="cx"> 2017-01-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Simplify cookie storage handling
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (210729 => 210730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-01-13 08:24:54 UTC (rev 210729)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-01-13 14:26:17 UTC (rev 210730)
</span><span class="lines">@@ -161,6 +161,9 @@
</span><span class="cx"> ASSERT([keyPath isEqualToString:@"status"]);
</span><span class="cx">
</span><span class="cx"> callOnMainThread([protectedSelf = WTFMove(protectedSelf), layer = WTFMove(layer), status = WTFMove(status)] {
</span><ins>+ if (!protectedSelf->_parent)
+ return;
+
</ins><span class="cx"> protectedSelf->_parent->layerStatusDidChange(layer.get(), status.get());
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -172,6 +175,9 @@
</span><span class="cx"> ASSERT([keyPath isEqualToString:@"status"]);
</span><span class="cx">
</span><span class="cx"> callOnMainThread([protectedSelf = WTFMove(protectedSelf), renderer = WTFMove(renderer), status = WTFMove(status)] {
</span><ins>+ if (!protectedSelf->_parent)
+ return;
+
</ins><span class="cx"> protectedSelf->_parent->rendererStatusDidChange(renderer.get(), status.get());
</span><span class="cx"> });
</span><span class="cx"> } else
</span><span class="lines">@@ -492,10 +498,15 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::layerStatusDidChange(AVSampleBufferDisplayLayer* layer, NSNumber* status)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(layer, layer == m_sampleBufferDisplayLayer);
- ASSERT(m_activeVideoTrack);
- if (status.integerValue == AVQueuedSampleBufferRenderingStatusRendering)
- m_videoTrackMap.get(m_activeVideoTrack->id())->setTimelineOffset(MediaTime::invalidTime());
</del><ins>+ if (status.integerValue != AVQueuedSampleBufferRenderingStatusRendering)
+ return;
+
+ if (layer != m_sampleBufferDisplayLayer || !m_activeVideoTrack)
+ return;
+
+ auto track = m_videoTrackMap.get(m_activeVideoTrack->id());
+ if (track)
+ track->setTimelineOffset(MediaTime::invalidTime());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::flushRenderers()
</span></span></pre>
</div>
</div>
</body>
</html>