Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: Source/WebCore/platform/graphics/MediaPlayer.cpp

Issue 13529026: Removing a bunch of unused platform code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix whitespace and compiler error on Mac. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/platform/graphics/LayoutSize.h ('k') | Source/WebCore/platform/graphics/NativeImagePtr.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/MediaPlayer.cpp
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/platform/graphics/MediaPlayer.cpp
index 89c5ba5a33b9a9dab7ef286894f939733543e841..8b98e83913efaf48d88ba4618be73547ce305468 100644
--- a/Source/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp
@@ -48,41 +48,13 @@
#include "MediaSource.h"
#endif
-#if PLATFORM(QT)
-#include <QtGlobal>
-#endif
-
#if USE(GSTREAMER)
#include "MediaPlayerPrivateGStreamer.h"
#define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
#endif
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
-#include "MediaPlayerPrivateQTKit.h"
-#if USE(AVFOUNDATION)
-#include "MediaPlayerPrivateAVFoundationObjC.h"
-#endif
-#elif OS(WINCE) && !PLATFORM(QT)
-#include "MediaPlayerPrivateWinCE.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivate
-#elif PLATFORM(WIN)
-#include "MediaPlayerPrivateQuickTimeVisualContext.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivateQuickTimeVisualContext
-#if USE(AVFOUNDATION)
-#include "MediaPlayerPrivateAVFoundationCF.h"
-#endif
-#elif PLATFORM(QT)
-#if USE(QT_MULTIMEDIA) && !USE(GSTREAMER)
-#include "MediaPlayerPrivateQt.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivateQt
-#endif
-#elif PLATFORM(CHROMIUM)
#include "MediaPlayerPrivateChromium.h"
#define PlatformMediaEngineClassName MediaPlayerPrivate
-#elif PLATFORM(BLACKBERRY)
-#include "MediaPlayerPrivateBlackBerry.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivate
-#endif
namespace WebCore {
@@ -215,21 +187,6 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines(RequeryEngineOptions r
if (!enginesQueried) {
enginesQueried = true;
-#if USE(AVFOUNDATION)
- if (Settings::isAVFoundationEnabled()) {
-#if PLATFORM(MAC)
- MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
-#elif PLATFORM(WIN)
- MediaPlayerPrivateAVFoundationCF::registerMediaEngine(addMediaEngine);
-#endif
- }
-#endif
-
-#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
- if (Settings::isQTKitEnabled())
- MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
-#endif
-
#if defined(PlatformMediaEngineClassName)
PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
#endif
@@ -749,22 +706,8 @@ MediaPlayer::SupportsType MediaPlayer::supportsType(const ContentType& contentTy
if (!engine)
return IsNotSupported;
-#if PLATFORM(MAC)
- // YouTube will ask if the HTMLMediaElement canPlayType video/webm, then
- // video/x-flv, then finally video/mp4, and will then load a URL of the first type
- // in that list which returns "probably". When Perian is installed,
- // MediaPlayerPrivateQTKit claims to support both video/webm and video/x-flv, but
- // due to a bug in Perian, loading media in these formats will sometimes fail on
- // slow connections. <https://bugs.webkit.org/show_bug.cgi?id=86409>
- if (client && client->mediaPlayerNeedsSiteSpecificHacks()) {
- String host = client->mediaPlayerDocumentHost();
- if ((host.endsWith(".youtube.com", false) || equalIgnoringCase("youtube.com", host))
- && (contentType.type().startsWith("video/webm", false) || contentType.type().startsWith("video/x-flv", false)))
- return IsNotSupported;
- }
-#else
+ // FIXME: Remove this parameter. This was used by the Mac port.
UNUSED_PARAM(client);
-#endif
#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
return engine->supportsTypeAndCodecs(type, typeCodecs, system, url);
@@ -1081,16 +1024,6 @@ String MediaPlayer::engineDescription() const
return m_private->engineDescription();
}
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-GraphicsDeviceAdapter* MediaPlayer::graphicsDeviceAdapter() const
-{
- if (!m_mediaPlayerClient)
- return 0;
-
- return m_mediaPlayerClient->mediaPlayerGraphicsDeviceAdapter(this);
-}
-#endif
-
CachedResourceLoader* MediaPlayer::cachedResourceLoader()
{
if (!m_mediaPlayerClient)
« no previous file with comments | « Source/WebCore/platform/graphics/LayoutSize.h ('k') | Source/WebCore/platform/graphics/NativeImagePtr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698