Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-06 23:29:08 UTC (rev 124812)
@@ -1,3 +1,38 @@
+2012-08-06 Lucas Forschler <[email protected]>
+
+ Merge 123747
+
+ 2012-07-26 Jer Noble <[email protected]>
+
+ Add a MediaPlayer API to retrieve the description of the current media engine.
+ https://bugs.webkit.org/show_bug.cgi?id=92336
+
+ Reviewed by Eric Carlson.
+
+ Add a utility function which retrieves, for diagnostic purposes, a brief description
+ of the current media engine. Stubs have been added for each of the MediaPlayerPrivate
+ subclasses which return the name of the class.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::engineDescription):
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::engineDescription):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ (WebCore::MediaPlayerPrivateAVFoundation::engineDescription):
+ * platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.h:
+ (WebCore::MediaPlayerPrivate::engineDescription):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ (WebCore::MediaPlayerPrivateGStreamer::engineDescription):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ (WebCore::MediaPlayerPrivateQTKit::engineDescription):
+ * platform/graphics/qt/MediaPlayerPrivateQt.h:
+ (WebCore::MediaPlayerPrivateQt::engineDescription):
+ * platform/graphics/wince/MediaPlayerPrivateWinCE.h:
+ (WebCore::MediaPlayerPrivate::engineDescription):
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+ (WebCore::MediaPlayerPrivateQuickTimeVisualContext::engineDescription):
+
2012-08-02 Lucas Forschler <[email protected]>
Merge 122676
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-08-06 23:29:08 UTC (rev 124812)
@@ -1044,6 +1044,14 @@
return m_mediaPlayerClient->mediaPlayerUserAgent();
}
+String MediaPlayer::engineDescription() const
+{
+ if (!m_private)
+ return String();
+
+ return m_private->engineDescription();
+}
+
#if PLATFORM(WIN) && USE(AVFOUNDATION)
GraphicsDeviceAdapter* MediaPlayer::graphicsDeviceAdapter() const
{
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayer.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -390,6 +390,8 @@
String referrer() const;
String userAgent() const;
+ String engineDescription() const;
+
private:
MediaPlayer(MediaPlayerClient*);
void loadWithNextMediaEngine(MediaPlayerFactory*);
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -155,6 +155,7 @@
virtual void setPrivateBrowsingMode(bool) { }
+ virtual String engineDescription() const { return emptyString(); }
#if ENABLE(WEB_AUDIO)
virtual AudioSourceProvider* audioSourceProvider() { return 0; }
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -244,6 +244,8 @@
MediaPlayer* player() { return m_player; }
+ virtual String engineDescription() const { return "AVFoundation"; }
+
private:
MediaPlayer* m_player;
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -143,6 +143,8 @@
void updateStates();
String userAgent(const String&) const;
+ virtual String engineDescription() const { return "BlackBerry"; }
+
MediaPlayer* m_webCorePlayer;
BlackBerry::Platform::MMRPlayer* m_platformPlayer;
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -149,6 +149,8 @@
void processBufferingStats(GstMessage*);
+ virtual String engineDescription() const { return "GStreamer"; }
+
private:
MediaPlayer* m_player;
GstElement* m_playBin;
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -186,6 +186,8 @@
NSMutableDictionary* commonMovieAttributes();
+ virtual String engineDescription() const { return "QTKit"; }
+
MediaPlayer* m_player;
RetainPtr<QTMovie> m_qtMovie;
RetainPtr<QTMovieView> m_qtMovieView;
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -137,6 +137,8 @@
private:
void updateStates();
+ virtual String engineDescription() const { return "Qt"; }
+
private:
MediaPlayerPrivateQt(MediaPlayer*);
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -156,6 +156,8 @@
virtual void setPrivateBrowsingMode(bool);
+ virtual String engineDescription() const { return "QuickTime"; }
+
class MovieClient;
friend class MovieClient;
OwnPtr<MovieClient> m_movieClient;
Modified: branches/safari-536.26-branch/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h (124811 => 124812)
--- branches/safari-536.26-branch/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h 2012-08-06 23:23:04 UTC (rev 124811)
+++ branches/safari-536.26-branch/Source/WebCore/platform/graphics/wince/MediaPlayerPrivateWinCE.h 2012-08-06 23:29:08 UTC (rev 124812)
@@ -102,6 +102,8 @@
static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
static bool isAvailable();
+ virtual String engineDescription() const { return "WinCE"; }
+
MediaPlayer* m_player;
float m_seekTo;
float m_endTime;
