Diff
Modified: trunk/LayoutTests/ChangeLog (287238 => 287239)
--- trunk/LayoutTests/ChangeLog 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/LayoutTests/ChangeLog 2021-12-19 10:03:22 UTC (rev 287239)
@@ -1,3 +1,12 @@
+2021-12-19 Philippe Normand <[email protected]>
+
+ [GTK][WPE][VTT] tests media/track/track-webvtt-* fail on GTK and WPE
+ https://bugs.webkit.org/show_bug.cgi?id=234083
+
+ Reviewed by Eric Carlson.
+
+ * platform/glib/TestExpectations:
+
2021-12-19 Jon Lee <[email protected]>
Garden tests that are passing iOS but marked failure.
Modified: trunk/LayoutTests/platform/glib/TestExpectations (287238 => 287239)
--- trunk/LayoutTests/platform/glib/TestExpectations 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/LayoutTests/platform/glib/TestExpectations 2021-12-19 10:03:22 UTC (rev 287239)
@@ -799,10 +799,6 @@
webkit.org/b/233836 http/tests/media/media-blocked-by-willsendrequest.html [ Timeout ]
-webkit.org/b/234083 media/track/track-webvtt-no-snap-to-lines-overlap.html [ ImageOnlyFailure ]
-webkit.org/b/234083 media/track/track-webvtt-snap-to-lines-inline-style.html [ ImageOnlyFailure ]
-webkit.org/b/234083 media/track/track-webvtt-snap-to-lines-left-right.html [ ImageOnlyFailure ]
-
webkit.org/b/234084 media/track/audio-track-configuration.html [ Failure ]
webkit.org/b/234084 media/track/video-track-configuration.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (287238 => 287239)
--- trunk/Source/WebCore/ChangeLog 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/ChangeLog 2021-12-19 10:03:22 UTC (rev 287239)
@@ -1,3 +1,30 @@
+2021-12-19 Philippe Normand <[email protected]>
+
+ [GTK][WPE][VTT] tests media/track/track-webvtt-* fail on GTK and WPE
+ https://bugs.webkit.org/show_bug.cgi?id=234083
+
+ Reviewed by Eric Carlson.
+
+ Remove ENABLE(AVF_CAPTIONS) from cross-platform call sites. This is needed only in the
+ AVFoundation player. The Adwaita media controls also now properly render
+ -webkit-media-text-track-display-backdrop as required for media/track tests and as done in
+ the Apple media controls.
+
+ * Modules/mediacontrols/mediaControlsAdwaita.css:
+ (video::-webkit-media-text-track-display-backdrop):
+ (video::-webkit-media-text-track-container b):
+ (video::-webkit-media-text-track-container u):
+ (video::-webkit-media-text-track-container i):
+ (video::-webkit-media-text-track-container .hidden,):
+ * html/HTMLMediaElement.cpp:
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::outOfBandTrackSources):
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::notifyTrackModeChanged):
+ * platform/graphics/PlatformTextTrack.h:
+
2021-12-19 Yusuke Suzuki <[email protected]>
Lazily allocate HistoricUsageData
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsAdwaita.css (287238 => 287239)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsAdwaita.css 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsAdwaita.css 2021-12-19 10:03:22 UTC (rev 287239)
@@ -504,3 +504,24 @@
video::cue(:future) {
color: gray;
}
+
+video::-webkit-media-text-track-display-backdrop {
+ display: inline-block;
+}
+
+video::-webkit-media-text-track-container b {
+ font-weight: bold;
+}
+
+video::-webkit-media-text-track-container u {
+ text-decoration: underline;
+}
+
+video::-webkit-media-text-track-container i {
+ font-style: italic;
+}
+
+video::-webkit-media-text-track-container .hidden,
+audio::-webkit-media-text-track-container .hidden {
+ display: none;
+}
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (287238 => 287239)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-12-19 10:03:22 UTC (rev 287239)
@@ -7186,8 +7186,6 @@
return frame->loader().userAgent(m_currentSrc);
}
-#if ENABLE(AVF_CAPTIONS)
-
static inline PlatformTextTrackData::TrackKind toPlatform(TextTrack::Kind kind)
{
switch (kind) {
@@ -7255,8 +7253,6 @@
return outOfBandTrackSources;
}
-#endif
-
bool HTMLMediaElement::mediaPlayerIsFullscreen() const
{
return isFullscreen();
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (287238 => 287239)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2021-12-19 10:03:22 UTC (rev 287239)
@@ -380,9 +380,7 @@
void mediaPlayerDidRemoveTextTrack(InbandTextTrackPrivate&) final;
void mediaPlayerDidRemoveVideoTrack(VideoTrackPrivate&) final;
-#if ENABLE(AVF_CAPTIONS)
Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() final;
-#endif
struct TrackGroup;
void configureTextTrackGroupForLanguage(const TrackGroup&) const;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (287238 => 287239)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2021-12-19 10:03:22 UTC (rev 287239)
@@ -1528,8 +1528,6 @@
m_private->tracksChanged();
}
-#if ENABLE(AVF_CAPTIONS)
-
void MediaPlayer::notifyTrackModeChanged()
{
if (m_private)
@@ -1541,8 +1539,6 @@
return client().outOfBandTrackSources();
}
-#endif
-
void MediaPlayer::resetMediaEngines()
{
Locker locker { mediaEngineVectorLock };
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (287238 => 287239)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2021-12-19 10:03:22 UTC (rev 287239)
@@ -34,6 +34,7 @@
#include "MediaPlayerEnums.h"
#include "MediaPlayerIdentifier.h"
#include "PlatformLayer.h"
+#include "PlatformTextTrack.h"
#include "SecurityOriginData.h"
#include "Timer.h"
#include "VideoFrameMetadata.h"
@@ -82,7 +83,6 @@
class MediaStreamPrivate;
class NativeImage;
class PlatformMediaResourceLoader;
-class PlatformTextTrack;
class PlatformTimeRanges;
class TextTrackRepresentation;
class VideoTrackPrivate;
@@ -246,9 +246,7 @@
virtual void textTrackRepresentationBoundsChanged(const IntRect&) { }
-#if ENABLE(AVF_CAPTIONS)
virtual Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() { return { }; }
-#endif
#if PLATFORM(IOS_FAMILY)
virtual String mediaPlayerNetworkInterfaceName() const { return String(); }
@@ -597,10 +595,8 @@
void syncTextTrackBounds();
void tracksChanged();
-#if ENABLE(AVF_CAPTIONS)
void notifyTrackModeChanged();
Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources();
-#endif
#if PLATFORM(IOS_FAMILY)
String mediaPlayerNetworkInterfaceName() const;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (287238 => 287239)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2021-12-19 10:03:22 UTC (rev 287239)
@@ -292,9 +292,7 @@
virtual std::optional<VideoPlaybackQualityMetrics> videoPlaybackQualityMetrics() { return std::nullopt; }
-#if ENABLE(AVF_CAPTIONS)
virtual void notifyTrackModeChanged() { }
-#endif
virtual void notifyActiveSourceBuffersChanged() { }
Modified: trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h (287238 => 287239)
--- trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h 2021-12-19 09:40:48 UTC (rev 287238)
+++ trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h 2021-12-19 10:03:22 UTC (rev 287239)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(AVF_CAPTIONS)
+#if ENABLE(VIDEO)
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
@@ -251,6 +251,4 @@
} // namespace WTF
-#endif // ENABLE(AVF_CAPTIONS)
-
-
+#endif // ENABLE(VIDEO)
