<!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>[260822] 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/260822">260822</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-28 07:17:17 -0700 (Tue, 28 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>media/track/track-load-error-readyState.html passes only when accompanied by some other tests
https://bugs.webkit.org/show_bug.cgi?id=210976

Reviewed by Xabier Rodriguez-Calvar.

Source/WebCore:

* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState): Reset caption
display mode, which might have been overriden by a previous test.

LayoutTests:

* media/track/track-load-error-readyState-expected.txt:
* media/track/track-load-error-readyState.html: Ensure the caption
display mode is set to automatic, this is a requirement for the
test.
* media/track/track-mode-not-changed-by-new-track-expected.txt:
* media/track/track-mode-not-changed-by-new-track.html: Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackloaderrorreadyStateexpectedtxt">trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackloaderrorreadyStatehtml">trunk/LayoutTests/media/track/track-load-error-readyState.html</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackmodenotchangedbynewtrackexpectedtxt">trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackmodenotchangedbynewtrackhtml">trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/LayoutTests/ChangeLog 2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2020-04-28  Philippe Normand  <pnormand@igalia.com>
+
+        media/track/track-load-error-readyState.html passes only when accompanied by some other tests
+        https://bugs.webkit.org/show_bug.cgi?id=210976
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * media/track/track-load-error-readyState-expected.txt:
+        * media/track/track-load-error-readyState.html: Ensure the caption
+        display mode is set to automatic, this is a requirement for the
+        test.
+        * media/track/track-mode-not-changed-by-new-track-expected.txt:
+        * media/track/track-mode-not-changed-by-new-track.html: Ditto.
+
</ins><span class="cx"> 2020-04-28  Per Arne Vollan  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Fix sandbox violation when uploading a file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackloaderrorreadyStateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt   2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt      2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> Tests the error event on HTMLTrackElement and ERROR readyState on TextTrack.
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+RUN(internals.setCaptionDisplayMode('Automatic'))
</ins><span class="cx"> EVENT(error)
</span><span class="cx"> EXPECTED (track.readyState == '3') OK
</span><span class="cx"> END OF TEST
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackloaderrorreadyStatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-load-error-readyState.html (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-load-error-readyState.html   2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/LayoutTests/media/track/track-load-error-readyState.html      2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -7,6 +7,12 @@
</span><span class="cx">         <script src=../video-test.js></script>
</span><span class="cx">         <script>
</span><span class="cx"> 
</span><ins>+            function setup()
+            {
+                if (window.internals)
+                    run("internals.setCaptionDisplayMode('Automatic')");
+            }
+
</ins><span class="cx">             function trackError()
</span><span class="cx">             {
</span><span class="cx">                 consoleWrite("EVENT(error)");
</span><span class="lines">@@ -17,7 +23,7 @@
</span><span class="cx"> 
</span><span class="cx">         </script>
</span><span class="cx">     </head>
</span><del>-    <body>
</del><ins>+    <body onload="setup()">
</ins><span class="cx">         <p>Tests the error event on HTMLTrackElement and ERROR readyState on TextTrack.</p>
</span><span class="cx">         <video id="videotests">
</span><span class="cx">             <track id="testTrackError" src="junk" onerror="trackError()" default>
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackmodenotchangedbynewtrackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track-expected.txt (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track-expected.txt   2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track-expected.txt      2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> Tests that a track appended after the initial track configuration does not change other tracks.
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+RUN(internals.setCaptionDisplayMode('Automatic'))
</ins><span class="cx"> 
</span><span class="cx"> EVENT(load) -- <body>
</span><span class="cx"> EXPECTED (track1.readyState == '0') OK
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackmodenotchangedbynewtrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track.html (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track.html   2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track.html      2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -78,6 +78,9 @@
</span><span class="cx"> 
</span><span class="cx">             function start()
</span><span class="cx">             {
</span><ins>+                if (window.internals)
+                    run("internals.setCaptionDisplayMode('Automatic')");
+
</ins><span class="cx">                 consoleWrite("<br>EVENT(load) -- &lt;body&gt;");
</span><span class="cx">                 findMediaElement();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/Source/WebCore/ChangeLog      2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2020-04-28  Philippe Normand  <pnormand@igalia.com>
+
+        media/track/track-load-error-readyState.html passes only when accompanied by some other tests
+        https://bugs.webkit.org/show_bug.cgi?id=210976
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState): Reset caption
+        display mode, which might have been overriden by a previous test.
+
</ins><span class="cx"> 2020-04-28  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Non-unified build fixes late April 2020 edition
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (260821 => 260822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp       2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/Source/WebCore/testing/Internals.cpp  2020-04-28 14:17:17 UTC (rev 260822)
</span><span class="lines">@@ -513,6 +513,7 @@
</span><span class="cx">     WebCore::DeprecatedGlobalSettings::setUsesMockScrollAnimator(false);
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">     page.group().captionPreferences().setTestingMode(true);
</span><ins>+    page.group().captionPreferences().setCaptionDisplayMode(CaptionUserPreferences::ForcedOnly);
</ins><span class="cx">     page.group().captionPreferences().setCaptionsStyleSheetOverride(emptyString());
</span><span class="cx">     page.group().captionPreferences().setTestingMode(false);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>