Diff
Modified: trunk/Source/WebCore/ChangeLog (227438 => 227439)
--- trunk/Source/WebCore/ChangeLog 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/ChangeLog 2018-01-23 21:33:35 UTC (rev 227439)
@@ -1,5 +1,34 @@
2018-01-23 Alex Christensen <achristen...@webkit.org>
+ Remove unused MediaPlayerSupportsTypeClient
+ https://bugs.webkit.org/show_bug.cgi?id=182003
+
+ Reviewed by Sam Weinig.
+
+ This was used for a QTKit-specific hack I removed in r227372.
+
+ * Modules/encryptedmedia/CDM.cpp:
+ (WebCore::CDM::getSupportedCapabilitiesForAudioVideoType):
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::isTypeSupported):
+ * dom/DOMImplementation.cpp:
+ (WebCore::DOMImplementation::createDocument):
+ (WebCore::DOMImplementationSupportsTypeClient::DOMImplementationSupportsTypeClient): Deleted.
+ (): Deleted.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::canPlayType const):
+ (WebCore::HTMLMediaElement::selectNextSourceChild):
+ (WebCore::HTMLMediaElement::mediaPlayerNeedsSiteSpecificHacks const): Deleted.
+ (WebCore::HTMLMediaElement::mediaPlayerDocumentHost const): Deleted.
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::supportsType):
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerSupportsTypeClient::mediaPlayerNeedsSiteSpecificHacks const): Deleted.
+ (WebCore::MediaPlayerSupportsTypeClient::mediaPlayerDocumentHost const): Deleted.
+
+2018-01-23 Alex Christensen <achristen...@webkit.org>
+
Remove unused QTKit preference
https://bugs.webkit.org/show_bug.cgi?id=181968
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (227438 => 227439)
--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2018-01-23 21:33:35 UTC (rev 227439)
@@ -468,10 +468,10 @@
// with restrictions:
MediaEngineSupportParameters parameters;
parameters.type = ContentType(contentType.mimeType());
- if (!MediaPlayer::supportsType(parameters, nullptr)) {
+ if (!MediaPlayer::supportsType(parameters)) {
// Try with Media Source:
parameters.isMediaSource = true;
- if (!MediaPlayer::supportsType(parameters, nullptr))
+ if (!MediaPlayer::supportsType(parameters))
continue;
}
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (227438 => 227439)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2018-01-23 21:33:35 UTC (rev 227439)
@@ -850,7 +850,7 @@
MediaEngineSupportParameters parameters;
parameters.type = contentType;
parameters.isMediaSource = true;
- MediaPlayer::SupportsType supported = MediaPlayer::supportsType(parameters, 0);
+ MediaPlayer::SupportsType supported = MediaPlayer::supportsType(parameters);
if (codecs.isEmpty())
return supported != MediaPlayer::IsNotSupported;
Modified: trunk/Source/WebCore/dom/DOMImplementation.cpp (227438 => 227439)
--- trunk/Source/WebCore/dom/DOMImplementation.cpp 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/dom/DOMImplementation.cpp 2018-01-23 21:33:35 UTC (rev 227439)
@@ -62,26 +62,6 @@
using namespace HTMLNames;
-#if ENABLE(VIDEO)
-
-class DOMImplementationSupportsTypeClient : public MediaPlayerSupportsTypeClient {
-public:
- DOMImplementationSupportsTypeClient(bool needsHacks, const String& host)
- : m_needsHacks(needsHacks)
- , m_host(host)
- {
- }
-
-private:
- bool mediaPlayerNeedsSiteSpecificHacks() const override { return m_needsHacks; }
- String mediaPlayerDocumentHost() const override { return m_host; }
-
- bool m_needsHacks;
- String m_host;
-};
-
-#endif
-
DOMImplementation::DOMImplementation(Document& document)
: m_document(document)
{
@@ -192,11 +172,10 @@
#if ENABLE(VIDEO)
// Check to see if the type can be played by our MediaPlayer, if so create a MediaDocument
// Key system is not applicable here.
- DOMImplementationSupportsTypeClient client(frame && frame->settings().needsSiteSpecificQuirks(), url.host());
MediaEngineSupportParameters parameters;
parameters.type = ContentType(type);
parameters.url = ""
- if (MediaPlayer::supportsType(parameters, &client))
+ if (MediaPlayer::supportsType(parameters))
return MediaDocument::create(frame, url);
#endif
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (227438 => 227439)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2018-01-23 21:33:35 UTC (rev 227439)
@@ -1189,7 +1189,7 @@
ContentType contentType(mimeType);
parameters.type = contentType;
parameters.contentTypesRequiringHardwareSupport = mediaContentTypesRequiringHardwareSupport();
- MediaPlayer::SupportsType support = MediaPlayer::supportsType(parameters, this);
+ MediaPlayer::SupportsType support = MediaPlayer::supportsType(parameters);
String canPlay;
// 4.8.10.3
@@ -4551,7 +4551,7 @@
if (!document().settings().allowMediaContentTypesRequiringHardwareSupportAsFallback() || Traversal<HTMLSourceElement>::nextSkippingChildren(source))
parameters.contentTypesRequiringHardwareSupport = mediaContentTypesRequiringHardwareSupport();
- if (!MediaPlayer::supportsType(parameters, this))
+ if (!MediaPlayer::supportsType(parameters))
goto CheckAgain;
}
@@ -6771,16 +6771,6 @@
#endif
-bool HTMLMediaElement::mediaPlayerNeedsSiteSpecificHacks() const
-{
- return document().settings().needsSiteSpecificQuirks();
-}
-
-String HTMLMediaElement::mediaPlayerDocumentHost() const
-{
- return document().url().host();
-}
-
void HTMLMediaElement::mediaPlayerEnterFullscreen()
{
enterFullscreen();
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (227438 => 227439)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2018-01-23 21:33:35 UTC (rev 227439)
@@ -123,7 +123,6 @@
: public HTMLElement
, public ActiveDOMObject
, public MediaControllerInterface
- , public MediaPlayerSupportsTypeClient
, public PlatformMediaSessionClient
, private MediaCanStartListener
, private MediaPlayerClient
@@ -677,9 +676,6 @@
String mediaPlayerReferrer() const override;
String mediaPlayerUserAgent() const override;
- bool mediaPlayerNeedsSiteSpecificHacks() const override;
- String mediaPlayerDocumentHost() const override;
-
void mediaPlayerEnterFullscreen() override;
void mediaPlayerExitFullscreen() override;
bool mediaPlayerIsFullscreen() const override;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (227438 => 227439)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2018-01-23 21:33:35 UTC (rev 227439)
@@ -900,7 +900,7 @@
return m_private->nativeImageForCurrentTime();
}
-MediaPlayer::SupportsType MediaPlayer::supportsType(const MediaEngineSupportParameters& parameters, const MediaPlayerSupportsTypeClient*)
+MediaPlayer::SupportsType MediaPlayer::supportsType(const MediaEngineSupportParameters& parameters)
{
// 4.8.10.3 MIME types - The canPlayType(type) method must return the empty string if type is a type that the
// user agent knows it cannot render or is the type "application/octet-stream"
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (227438 => 227439)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2018-01-23 21:32:39 UTC (rev 227438)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2018-01-23 21:33:35 UTC (rev 227439)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MediaPlayer_h
-#define MediaPlayer_h
+#pragma once
#if ENABLE(VIDEO)
#include "GraphicsTypes3D.h"
@@ -308,14 +307,6 @@
#endif
};
-class MediaPlayerSupportsTypeClient {
-public:
- virtual ~MediaPlayerSupportsTypeClient() = default;
-
- virtual bool mediaPlayerNeedsSiteSpecificHacks() const { return false; }
- virtual String mediaPlayerDocumentHost() const { return String(); }
-};
-
class MediaPlayer : public MediaPlayerEnums, public RefCounted<MediaPlayer> {
WTF_MAKE_NONCOPYABLE(MediaPlayer); WTF_MAKE_FAST_ALLOCATED;
public:
@@ -326,7 +317,7 @@
// Media engine support.
enum SupportsType { IsNotSupported, IsSupported, MayBeSupported };
- static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&, const MediaPlayerSupportsTypeClient*);
+ static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
static bool isAvailable();
static HashSet<RefPtr<SecurityOrigin>> originsInMediaCache(const String& path);
@@ -708,5 +699,3 @@
}
#endif // ENABLE(VIDEO)
-
-#endif
