Title: [260822] trunk
- Revision
- 260822
- Author
- [email protected]
- Date
- 2020-04-28 07:17:17 -0700 (Tue, 28 Apr 2020)
Log Message
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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (260821 => 260822)
--- trunk/LayoutTests/ChangeLog 2020-04-28 14:14:48 UTC (rev 260821)
+++ trunk/LayoutTests/ChangeLog 2020-04-28 14:17:17 UTC (rev 260822)
@@ -1,3 +1,17 @@
+2020-04-28 Philippe Normand <[email protected]>
+
+ 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.
+
2020-04-28 Per Arne Vollan <[email protected]>
[iOS] Fix sandbox violation when uploading a file
Modified: trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt (260821 => 260822)
--- 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)
@@ -1,6 +1,7 @@
Tests the error event on HTMLTrackElement and ERROR readyState on TextTrack.
+RUN(internals.setCaptionDisplayMode('Automatic'))
EVENT(error)
EXPECTED (track.readyState == '3') OK
END OF TEST
Modified: trunk/LayoutTests/media/track/track-load-error-readyState.html (260821 => 260822)
--- 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)
@@ -7,6 +7,12 @@
<script src=""
<script>
+ function setup()
+ {
+ if (window.internals)
+ run("internals.setCaptionDisplayMode('Automatic')");
+ }
+
function trackError()
{
consoleWrite("EVENT(error)");
@@ -17,7 +23,7 @@
</script>
</head>
- <body>
+ <body _onload_="setup()">
<p>Tests the error event on HTMLTrackElement and ERROR readyState on TextTrack.</p>
<video id="videotests">
<track id="testTrackError" src="" _onerror_="trackError()" default>
Modified: trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track-expected.txt (260821 => 260822)
--- 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)
@@ -1,6 +1,7 @@
Tests that a track appended after the initial track configuration does not change other tracks.
+RUN(internals.setCaptionDisplayMode('Automatic'))
EVENT(load) -- <body>
EXPECTED (track1.readyState == '0') OK
Modified: trunk/LayoutTests/media/track/track-mode-not-changed-by-new-track.html (260821 => 260822)
--- 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)
@@ -78,6 +78,9 @@
function start()
{
+ if (window.internals)
+ run("internals.setCaptionDisplayMode('Automatic')");
+
consoleWrite("<br>EVENT(load) -- <body>");
findMediaElement();
Modified: trunk/Source/WebCore/ChangeLog (260821 => 260822)
--- 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)
@@ -1,3 +1,14 @@
+2020-04-28 Philippe Normand <[email protected]>
+
+ 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.
+
2020-04-28 Adrian Perez de Castro <[email protected]>
Non-unified build fixes late April 2020 edition
Modified: trunk/Source/WebCore/testing/Internals.cpp (260821 => 260822)
--- 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)
@@ -513,6 +513,7 @@
WebCore::DeprecatedGlobalSettings::setUsesMockScrollAnimator(false);
#if ENABLE(VIDEO_TRACK)
page.group().captionPreferences().setTestingMode(true);
+ page.group().captionPreferences().setCaptionDisplayMode(CaptionUserPreferences::ForcedOnly);
page.group().captionPreferences().setCaptionsStyleSheetOverride(emptyString());
page.group().captionPreferences().setTestingMode(false);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
