Diff
Modified: trunk/Source/WebCore/ChangeLog (256935 => 256936)
--- trunk/Source/WebCore/ChangeLog 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/ChangeLog 2020-02-19 20:54:09 UTC (rev 256936)
@@ -1,3 +1,24 @@
+2020-02-19 Youenn Fablet <[email protected]>
+
+ Remove PlatformMediaSession::characteristics()
+ https://bugs.webkit.org/show_bug.cgi?id=207926
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior, removing no longer used code.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::characteristics const): Deleted.
+ * Modules/mediastream/MediaStreamTrack.h:
+ * Modules/webaudio/AudioContext.h:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::characteristics const): Deleted.
+ * html/HTMLMediaElement.h:
+ * platform/audio/PlatformMediaSession.cpp:
+ (WebCore::PlatformMediaSession::characteristics const): Deleted.
+ * platform/audio/PlatformMediaSession.h:
+ (WebCore::PlatformMediaSessionClient::displayType const):
+
2020-02-19 Zalan Bujtas <[email protected]>
[LFC][Floats] FloatingContext::constraints should be able to handle empty candidate ranges (points)
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (256935 => 256936)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2020-02-19 20:54:09 UTC (rev 256936)
@@ -590,14 +590,6 @@
return mediaType();
}
-PlatformMediaSession::CharacteristicsFlags MediaStreamTrack::characteristics() const
-{
- if (!m_private->isActive())
- return PlatformMediaSession::HasNothing;
-
- return m_private->type() == RealtimeMediaSource::Type::Audio ? PlatformMediaSession::HasAudio : PlatformMediaSession::HasVideo;
-}
-
void MediaStreamTrack::mayResumePlayback(bool)
{
// FIXME: should a media stream track pay attention to this directly, or only when attached to a media element?
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (256935 => 256936)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2020-02-19 20:54:09 UTC (rev 256936)
@@ -193,7 +193,6 @@
// PlatformMediaSessionClient
PlatformMediaSession::MediaType mediaType() const final;
PlatformMediaSession::MediaType presentationType() const final;
- PlatformMediaSession::CharacteristicsFlags characteristics() const final;
void mayResumePlayback(bool shouldResume) final;
void suspendPlayback() final;
bool canReceiveRemoteControlCommands() const final { return false; }
Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (256935 => 256936)
--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2020-02-19 20:54:09 UTC (rev 256936)
@@ -349,7 +349,6 @@
// PlatformMediaSessionClient
PlatformMediaSession::MediaType mediaType() const override { return PlatformMediaSession::WebAudio; }
PlatformMediaSession::MediaType presentationType() const override { return PlatformMediaSession::WebAudio; }
- PlatformMediaSession::CharacteristicsFlags characteristics() const override { return m_state == State::Running ? PlatformMediaSession::HasAudio : PlatformMediaSession::HasNothing; }
void mayResumePlayback(bool shouldResume) override;
void suspendPlayback() override;
bool canReceiveRemoteControlCommands() const override { return false; }
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (256935 => 256936)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2020-02-19 20:54:09 UTC (rev 256936)
@@ -7545,20 +7545,6 @@
return PlatformMediaSession::Normal;
}
-PlatformMediaSession::CharacteristicsFlags HTMLMediaElement::characteristics() const
-{
- if (m_readyState < HAVE_METADATA)
- return PlatformMediaSession::HasNothing;
-
- PlatformMediaSession::CharacteristicsFlags state = PlatformMediaSession::HasNothing;
- if (isVideo() && hasVideo())
- state |= PlatformMediaSession::HasVideo;
- if (this->hasAudio())
- state |= PlatformMediaSession::HasAudio;
-
- return state;
-}
-
bool HTMLMediaElement::canProduceAudio() const
{
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (256935 => 256936)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2020-02-19 20:54:09 UTC (rev 256936)
@@ -877,7 +877,6 @@
PlatformMediaSession::MediaType mediaType() const override;
PlatformMediaSession::MediaType presentationType() const override;
PlatformMediaSession::DisplayType displayType() const override;
- PlatformMediaSession::CharacteristicsFlags characteristics() const final;
void suspendPlayback() override;
void resumeAutoplaying() override;
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp (256935 => 256936)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2020-02-19 20:54:09 UTC (rev 256936)
@@ -276,11 +276,6 @@
return m_client.presentationType();
}
-PlatformMediaSession::CharacteristicsFlags PlatformMediaSession::characteristics() const
-{
- return m_client.characteristics();
-}
-
#if ENABLE(VIDEO)
uint64_t PlatformMediaSession::uniqueIdentifier() const
{
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.h (256935 => 256936)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2020-02-19 20:39:39 UTC (rev 256935)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2020-02-19 20:54:09 UTC (rev 256936)
@@ -97,14 +97,6 @@
MayResumePlaying = 1 << 0,
};
- enum Characteristics {
- HasNothing = 0,
- HasAudio = 1 << 0,
- HasVideo = 1 << 1,
- };
- typedef unsigned CharacteristicsFlags;
-
- CharacteristicsFlags characteristics() const;
void clientCharacteristicsChanged();
void beginInterruption(InterruptionType);
@@ -233,7 +225,6 @@
virtual PlatformMediaSession::MediaType mediaType() const = 0;
virtual PlatformMediaSession::MediaType presentationType() const = 0;
virtual PlatformMediaSession::DisplayType displayType() const { return PlatformMediaSession::Normal; }
- virtual PlatformMediaSession::CharacteristicsFlags characteristics() const = 0;
virtual void resumeAutoplaying() { }
virtual void mayResumePlayback(bool shouldResume) = 0;
