Changeset 72117 in webkit

Timestamp:

Nov 16, 2010 10:28:22 AM (13 years ago)

Author:

eric.carlson@apple.com

Message:

2010-11-16 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Darin Adler.

Rename QTKit based media engine class name
​https://bugs.webkit.org/show_bug.cgi?id=36663

No new tests as this just renames a class and restructures existing code.

• platform/graphics/MediaPlayer.cpp: (WebCore::installedMediaEngines): Use a macro with the platform media player class name to reduce the number of #ifs in the code.

• platform/graphics/mac/MediaPlayerPrivateQTKit.h: Rename MediaPlayerPrivate to MediaPlayerPrivateQTKit.
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm: (WebCore::MediaPlayerPrivateQTKit::create): (WebCore::MediaPlayerPrivateQTKit::registerMediaEngine): (WebCore::MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit): (WebCore::MediaPlayerPrivateQTKit::~MediaPlayerPrivateQTKit): (WebCore::MediaPlayerPrivateQTKit::createQTMovie): (WebCore::MediaPlayerPrivateQTKit::createQTMovieView): (WebCore::MediaPlayerPrivateQTKit::detachQTMovieView): (WebCore::MediaPlayerPrivateQTKit::createQTVideoRenderer): (WebCore::MediaPlayerPrivateQTKit::destroyQTVideoRenderer): (WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer): (WebCore::MediaPlayerPrivateQTKit::destroyQTMovieLayer): (WebCore::MediaPlayerPrivateQTKit::currentRenderingMode): (WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode): (WebCore::MediaPlayerPrivateQTKit::setUpVideoRendering): (WebCore::MediaPlayerPrivateQTKit::tearDownVideoRendering): (WebCore::MediaPlayerPrivateQTKit::hasSetUpVideoRendering): (WebCore::MediaPlayerPrivateQTKit::createQTTime): (WebCore::MediaPlayerPrivateQTKit::resumeLoad): (WebCore::MediaPlayerPrivateQTKit::load): (WebCore::MediaPlayerPrivateQTKit::loadInternal): (WebCore::MediaPlayerPrivateQTKit::prepareToPlay): (WebCore::MediaPlayerPrivateQTKit::platformMedia): (WebCore::MediaPlayerPrivateQTKit::platformLayer): (WebCore::MediaPlayerPrivateQTKit::play): (WebCore::MediaPlayerPrivateQTKit::pause): (WebCore::MediaPlayerPrivateQTKit::duration): (WebCore::MediaPlayerPrivateQTKit::currentTime): (WebCore::MediaPlayerPrivateQTKit::seek): (WebCore::MediaPlayerPrivateQTKit::doSeek): (WebCore::MediaPlayerPrivateQTKit::cancelSeek): (WebCore::MediaPlayerPrivateQTKit::seekTimerFired): (WebCore::MediaPlayerPrivateQTKit::paused): (WebCore::MediaPlayerPrivateQTKit::seeking): (WebCore::MediaPlayerPrivateQTKit::naturalSize): (WebCore::MediaPlayerPrivateQTKit::hasVideo): (WebCore::MediaPlayerPrivateQTKit::hasAudio): (WebCore::MediaPlayerPrivateQTKit::supportsFullscreen): (WebCore::MediaPlayerPrivateQTKit::setVolume): (WebCore::MediaPlayerPrivateQTKit::hasClosedCaptions): (WebCore::MediaPlayerPrivateQTKit::setClosedCaptionsVisible): (WebCore::MediaPlayerPrivateQTKit::setRate): (WebCore::MediaPlayerPrivateQTKit::setPreservesPitch): (WebCore::MediaPlayerPrivateQTKit::buffered): (WebCore::MediaPlayerPrivateQTKit::maxTimeSeekable): (WebCore::MediaPlayerPrivateQTKit::maxTimeLoaded): (WebCore::MediaPlayerPrivateQTKit::bytesLoaded): (WebCore::MediaPlayerPrivateQTKit::totalBytes): (WebCore::MediaPlayerPrivateQTKit::cancelLoad): (WebCore::MediaPlayerPrivateQTKit::cacheMovieScale): (WebCore::MediaPlayerPrivateQTKit::isReadyForVideoSetup): (WebCore::MediaPlayerPrivateQTKit::prepareForRendering): (WebCore::MediaPlayerPrivateQTKit::updateStates): (WebCore::MediaPlayerPrivateQTKit::loadStateChanged): (WebCore::MediaPlayerPrivateQTKit::rateChanged): (WebCore::MediaPlayerPrivateQTKit::sizeChanged): (WebCore::MediaPlayerPrivateQTKit::timeChanged): (WebCore::MediaPlayerPrivateQTKit::didEnd): (WebCore::MediaPlayerPrivateQTKit::setSize): (WebCore::MediaPlayerPrivateQTKit::setVisible): (WebCore::MediaPlayerPrivateQTKit::hasAvailableVideoFrame): (WebCore::MediaPlayerPrivateQTKit::repaint): (WebCore::MediaPlayerPrivateQTKit::paintCurrentFrameInContext): (WebCore::MediaPlayerPrivateQTKit::paint): (WebCore::MediaPlayerPrivateQTKit::getSupportedTypes): (WebCore::MediaPlayerPrivateQTKit::supportsType): (WebCore::MediaPlayerPrivateQTKit::isAvailable): (WebCore::MediaPlayerPrivateQTKit::disableUnsupportedTracks): (WebCore::MediaPlayerPrivateQTKit::sawUnsupportedTracks): (WebCore::MediaPlayerPrivateQTKit::supportsAcceleratedRendering): (WebCore::MediaPlayerPrivateQTKit::acceleratedRenderingStateChanged): (WebCore::MediaPlayerPrivateQTKit::hasSingleSecurityOrigin): (WebCore::MediaPlayerPrivateQTKit::movieLoadType): (WebCore::MediaPlayerPrivateQTKit::setPreload): (WebCore::MediaPlayerPrivateQTKit::mediaTimeForTimeValue): (-[WebCoreMovieObserver initWithCallback:]):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/MediaPlayer.cpp (modified) (2 diffs)
• platform/graphics/mac/MediaPlayerPrivateQTKit.h (modified) (4 diffs)
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (75 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Rename QTKit based media engine class name
+        https://bugs.webkit.org/show_bug.cgi?id=36663
+
+        No new tests as this just renames a class and restructures existing code.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines): Use a macro with the platform media player class name to reduce the
+        number of #ifs in the code.
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h: Rename MediaPlayerPrivate to MediaPlayerPrivateQTKit.
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::create):
+        (WebCore::MediaPlayerPrivateQTKit::registerMediaEngine):
+        (WebCore::MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit):
+        (WebCore::MediaPlayerPrivateQTKit::~MediaPlayerPrivateQTKit):
+        (WebCore::MediaPlayerPrivateQTKit::createQTMovie):
+        (WebCore::MediaPlayerPrivateQTKit::createQTMovieView):
+        (WebCore::MediaPlayerPrivateQTKit::detachQTMovieView):
+        (WebCore::MediaPlayerPrivateQTKit::createQTVideoRenderer):
+        (WebCore::MediaPlayerPrivateQTKit::destroyQTVideoRenderer):
+        (WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer):
+        (WebCore::MediaPlayerPrivateQTKit::destroyQTMovieLayer):
+        (WebCore::MediaPlayerPrivateQTKit::currentRenderingMode):
+        (WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode):
+        (WebCore::MediaPlayerPrivateQTKit::setUpVideoRendering):
+        (WebCore::MediaPlayerPrivateQTKit::tearDownVideoRendering):
+        (WebCore::MediaPlayerPrivateQTKit::hasSetUpVideoRendering):
+        (WebCore::MediaPlayerPrivateQTKit::createQTTime):
+        (WebCore::MediaPlayerPrivateQTKit::resumeLoad):
+        (WebCore::MediaPlayerPrivateQTKit::load):
+        (WebCore::MediaPlayerPrivateQTKit::loadInternal):
+        (WebCore::MediaPlayerPrivateQTKit::prepareToPlay):
+        (WebCore::MediaPlayerPrivateQTKit::platformMedia):
+        (WebCore::MediaPlayerPrivateQTKit::platformLayer):
+        (WebCore::MediaPlayerPrivateQTKit::play):
+        (WebCore::MediaPlayerPrivateQTKit::pause):
+        (WebCore::MediaPlayerPrivateQTKit::duration):
+        (WebCore::MediaPlayerPrivateQTKit::currentTime):
+        (WebCore::MediaPlayerPrivateQTKit::seek):
+        (WebCore::MediaPlayerPrivateQTKit::doSeek):
+        (WebCore::MediaPlayerPrivateQTKit::cancelSeek):
+        (WebCore::MediaPlayerPrivateQTKit::seekTimerFired):
+        (WebCore::MediaPlayerPrivateQTKit::paused):
+        (WebCore::MediaPlayerPrivateQTKit::seeking):
+        (WebCore::MediaPlayerPrivateQTKit::naturalSize):
+        (WebCore::MediaPlayerPrivateQTKit::hasVideo):
+        (WebCore::MediaPlayerPrivateQTKit::hasAudio):
+        (WebCore::MediaPlayerPrivateQTKit::supportsFullscreen):
+        (WebCore::MediaPlayerPrivateQTKit::setVolume):
+        (WebCore::MediaPlayerPrivateQTKit::hasClosedCaptions):
+        (WebCore::MediaPlayerPrivateQTKit::setClosedCaptionsVisible):
+        (WebCore::MediaPlayerPrivateQTKit::setRate):
+        (WebCore::MediaPlayerPrivateQTKit::setPreservesPitch):
+        (WebCore::MediaPlayerPrivateQTKit::buffered):
+        (WebCore::MediaPlayerPrivateQTKit::maxTimeSeekable):
+        (WebCore::MediaPlayerPrivateQTKit::maxTimeLoaded):
+        (WebCore::MediaPlayerPrivateQTKit::bytesLoaded):
+        (WebCore::MediaPlayerPrivateQTKit::totalBytes):
+        (WebCore::MediaPlayerPrivateQTKit::cancelLoad):
+        (WebCore::MediaPlayerPrivateQTKit::cacheMovieScale):
+        (WebCore::MediaPlayerPrivateQTKit::isReadyForVideoSetup):
+        (WebCore::MediaPlayerPrivateQTKit::prepareForRendering):
+        (WebCore::MediaPlayerPrivateQTKit::updateStates):
+        (WebCore::MediaPlayerPrivateQTKit::loadStateChanged):
+        (WebCore::MediaPlayerPrivateQTKit::rateChanged):
+        (WebCore::MediaPlayerPrivateQTKit::sizeChanged):
+        (WebCore::MediaPlayerPrivateQTKit::timeChanged):
+        (WebCore::MediaPlayerPrivateQTKit::didEnd):
+        (WebCore::MediaPlayerPrivateQTKit::setSize):
+        (WebCore::MediaPlayerPrivateQTKit::setVisible):
+        (WebCore::MediaPlayerPrivateQTKit::hasAvailableVideoFrame):
+        (WebCore::MediaPlayerPrivateQTKit::repaint):
+        (WebCore::MediaPlayerPrivateQTKit::paintCurrentFrameInContext):
+        (WebCore::MediaPlayerPrivateQTKit::paint):
+        (WebCore::MediaPlayerPrivateQTKit::getSupportedTypes):
+        (WebCore::MediaPlayerPrivateQTKit::supportsType):
+        (WebCore::MediaPlayerPrivateQTKit::isAvailable):
+        (WebCore::MediaPlayerPrivateQTKit::disableUnsupportedTracks):
+        (WebCore::MediaPlayerPrivateQTKit::sawUnsupportedTracks):
+        (WebCore::MediaPlayerPrivateQTKit::supportsAcceleratedRendering):
+        (WebCore::MediaPlayerPrivateQTKit::acceleratedRenderingStateChanged):
+        (WebCore::MediaPlayerPrivateQTKit::hasSingleSecurityOrigin):
+        (WebCore::MediaPlayerPrivateQTKit::movieLoadType):
+        (WebCore::MediaPlayerPrivateQTKit::setPreload):
+        (WebCore::MediaPlayerPrivateQTKit::mediaTimeForTimeValue):
+        (-[WebCoreMovieObserver initWithCallback:]):
+
 2010-11-16  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/platform/graphics/MediaPlayer.cpp

@@ -48 +48 @@
 #if PLATFORM(MAC)
 #include "MediaPlayerPrivateQTKit.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivateQTKit
 #elif OS(WINCE) && !PLATFORM(QT)
 #include "MediaPlayerPrivateWinCE.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivate
 #elif PLATFORM(WIN)
 #include "MediaPlayerPrivateQuickTimeVisualContext.h"
-#include "MediaPlayerPrivateQuicktimeWin.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivateQuickTimeVisualContext
 #elif PLATFORM(QT)
 #if USE(QT_MULTIMEDIA)
 #include "MediaPlayerPrivateQt.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivateQt
 #else
 #include "MediaPlayerPrivatePhonon.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivatePhonon
 #endif
 #elif PLATFORM(CHROMIUM)
 #include "MediaPlayerPrivateChromium.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivate
 #endif
 
@@ -166 +171 @@
     if (!enginesQueried) {
         enginesQueried = true;
+
 #if USE(GSTREAMER)
         MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
 #endif
-
-#if PLATFORM(WIN)
-        MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(addMediaEngine);
-#elif PLATFORM(QT)
-#if USE(QT_MULTIMEDIA)
-        MediaPlayerPrivateQt::registerMediaEngine(addMediaEngine);
-#else
-        MediaPlayerPrivatePhonon::registerMediaEngine(addMediaEngine);
-#endif
-#elif !PLATFORM(GTK) && !PLATFORM(EFL)
-        // FIXME: currently all the MediaEngines are named
-        // MediaPlayerPrivate. This code will need an update when bug
-        // 36663 is adressed.
-        MediaPlayerPrivate::registerMediaEngine(addMediaEngine);
-#endif
-
-        // register additional engines here
+        PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
     }
     

trunk/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h

@@ -56 +56 @@
 namespace WebCore {
 
-class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
+class MediaPlayerPrivateQTKit : public MediaPlayerPrivateInterface {
 public:
     static void registerMediaEngine(MediaEngineRegistrar);
@@ -68 +68 @@
 
 private:
-    MediaPlayerPrivate(MediaPlayer*);
-    ~MediaPlayerPrivate();
+    MediaPlayerPrivateQTKit(MediaPlayer*);
+    ~MediaPlayerPrivateQTKit();
 
     // engine support
@@ -164 +164 @@
     void doSeek();
     void cancelSeek();
-    void seekTimerFired(Timer<MediaPlayerPrivate>*);
+    void seekTimerFired(Timer<MediaPlayerPrivateQTKit>*);
     float maxTimeLoaded() const;
     void disableUnsupportedTracks();
@@ -185 +185 @@
     String m_movieURL;
     float m_seekTo;
-    Timer<MediaPlayerPrivate> m_seekTimer;
+    Timer<MediaPlayerPrivateQTKit> m_seekTimer;
     MediaPlayer::NetworkState m_networkState;
     MediaPlayer::ReadyState m_readyState;

trunk/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

@@ -165 +165 @@
 @interface WebCoreMovieObserver : NSObject
 {
-    MediaPlayerPrivate* m_callback;
+    MediaPlayerPrivateQTKit* m_callback;
     NSView* m_view;
     BOOL m_delayCallbacks;
 }
--(id)initWithCallback:(MediaPlayerPrivate*)callback;
+-(id)initWithCallback:(MediaPlayerPrivateQTKit*)callback;
 -(void)disconnect;
 -(void)setView:(NSView*)view;
@@ -193 +193 @@
 
 
-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player) 
+MediaPlayerPrivateInterface* MediaPlayerPrivateQTKit::create(MediaPlayer* player) 
 { 
-    return new MediaPlayerPrivate(player);
-}
-
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+    return new MediaPlayerPrivateQTKit(player);
+}
+
+void MediaPlayerPrivateQTKit::registerMediaEngine(MediaEngineRegistrar registrar)
 {
     if (isAvailable())
@@ -204 +204 @@
 }
 
-MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
+MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit(MediaPlayer* player)
     : m_player(player)
     , m_objcObserver(AdoptNS, [[WebCoreMovieObserver alloc] initWithCallback:this])
     , m_seekTo(-1)
-    , m_seekTimer(this, &MediaPlayerPrivate::seekTimerFired)
+    , m_seekTimer(this, &MediaPlayerPrivateQTKit::seekTimerFired)
     , m_networkState(MediaPlayer::Empty)
     , m_readyState(MediaPlayer::HaveNothing)
@@ -233 +233 @@
 }
 
-MediaPlayerPrivate::~MediaPlayerPrivate()
+MediaPlayerPrivateQTKit::~MediaPlayerPrivateQTKit()
 {
     tearDownVideoRendering();
@@ -241 +241 @@
 }
 
-void MediaPlayerPrivate::createQTMovie(const String& url)
+void MediaPlayerPrivateQTKit::createQTMovie(const String& url)
 {
     NSURL *cocoaURL = KURL(ParsedURLString, url);
@@ -321 +321 @@
 }
 
-void MediaPlayerPrivate::createQTMovie(NSURL *url, NSDictionary *movieAttributes)
+void MediaPlayerPrivateQTKit::createQTMovie(NSURL *url, NSDictionary *movieAttributes)
 {
     disableComponentsOnce();
@@ -404 +404 @@
 }
 
-void MediaPlayerPrivate::createQTMovieView()
+void MediaPlayerPrivateQTKit::createQTMovieView()
 {
     detachQTMovieView();
@@ -449 +449 @@
 }
 
-void MediaPlayerPrivate::detachQTMovieView()
+void MediaPlayerPrivateQTKit::detachQTMovieView()
 {
     if (m_qtMovieView) {
@@ -464 +464 @@
 }
 
-void MediaPlayerPrivate::createQTVideoRenderer(QTVideoRendererMode rendererMode)
+void MediaPlayerPrivateQTKit::createQTVideoRenderer(QTVideoRendererMode rendererMode)
 {
     destroyQTVideoRenderer();
@@ -484 +484 @@
 }
 
-void MediaPlayerPrivate::destroyQTVideoRenderer()
+void MediaPlayerPrivateQTKit::destroyQTVideoRenderer()
 {
     if (!m_qtVideoRenderer)
@@ -500 +500 @@
 }
 
-void MediaPlayerPrivate::createQTMovieLayer()
+void MediaPlayerPrivateQTKit::createQTMovieLayer()
 {
 #if USE(ACCELERATED_COMPOSITING)
@@ -522 +522 @@
 }
 
-void MediaPlayerPrivate::destroyQTMovieLayer()
+void MediaPlayerPrivateQTKit::destroyQTMovieLayer()
 {
 #if USE(ACCELERATED_COMPOSITING)
@@ -534 +534 @@
 }
 
-MediaPlayerPrivate::MediaRenderingMode MediaPlayerPrivate::currentRenderingMode() const
+MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::currentRenderingMode() const
 {
     if (m_qtMovieView)
@@ -548 +548 @@
 }
 
-MediaPlayerPrivate::MediaRenderingMode MediaPlayerPrivate::preferredRenderingMode() const
+MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::preferredRenderingMode() const
 {
     if (!m_player->frameView() || !m_qtMovie)
@@ -564 +564 @@
 }
 
-void MediaPlayerPrivate::setUpVideoRendering()
+void MediaPlayerPrivateQTKit::setUpVideoRendering()
 {
     if (!isReadyForVideoSetup())
@@ -595 +595 @@
 }
 
-void MediaPlayerPrivate::tearDownVideoRendering()
+void MediaPlayerPrivateQTKit::tearDownVideoRendering()
 {
     if (m_qtMovieView)
@@ -605 +605 @@
 }
 
-bool MediaPlayerPrivate::hasSetUpVideoRendering() const
+bool MediaPlayerPrivateQTKit::hasSetUpVideoRendering() const
 {
     return m_qtMovieView
@@ -612 +612 @@
 }
 
-QTTime MediaPlayerPrivate::createQTTime(float time) const
+QTTime MediaPlayerPrivateQTKit::createQTTime(float time) const
 {
     if (!metaDataAvailable())
@@ -620 +620 @@
 }
 
-void MediaPlayerPrivate::resumeLoad()
+void MediaPlayerPrivateQTKit::resumeLoad()
 {
     m_delayingLoad = false;
@@ -628 +628 @@
 }
 
-void MediaPlayerPrivate::load(const String& url)
+void MediaPlayerPrivateQTKit::load(const String& url)
 {
     m_movieURL = url;
@@ -642 +642 @@
 }
 
-void MediaPlayerPrivate::loadInternal(const String& url)
+void MediaPlayerPrivateQTKit::loadInternal(const String& url)
 {
     if (m_networkState != MediaPlayer::Loading) {
@@ -663 +663 @@
 }
 
-void MediaPlayerPrivate::prepareToPlay()
+void MediaPlayerPrivateQTKit::prepareToPlay()
 {
     if (!m_qtMovie || m_delayingLoad)
@@ -669 +669 @@
 }
 
-PlatformMedia MediaPlayerPrivate::platformMedia() const
+PlatformMedia MediaPlayerPrivateQTKit::platformMedia() const
 {
     PlatformMedia pm;
@@ -678 +678 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-PlatformLayer* MediaPlayerPrivate::platformLayer() const
+PlatformLayer* MediaPlayerPrivateQTKit::platformLayer() const
 {
     return m_qtVideoLayer.get();
@@ -684 +684 @@
 #endif
 
-void MediaPlayerPrivate::play()
+void MediaPlayerPrivateQTKit::play()
 {
     if (!metaDataAvailable())
@@ -697 +697 @@
 }
 
-void MediaPlayerPrivate::pause()
+void MediaPlayerPrivateQTKit::pause()
 {
     if (!metaDataAvailable())
@@ -710 +710 @@
 }
 
-float MediaPlayerPrivate::duration() const
+float MediaPlayerPrivateQTKit::duration() const
 {
     if (!metaDataAvailable())
@@ -724 +724 @@
 }
 
-float MediaPlayerPrivate::currentTime() const
+float MediaPlayerPrivateQTKit::currentTime() const
 {
     if (!metaDataAvailable())
@@ -732 +732 @@
 }
 
-void MediaPlayerPrivate::seek(float time)
+void MediaPlayerPrivateQTKit::seek(float time)
 {
     // Nothing to do if we are already in the middle of a seek to the same time.
@@ -753 +753 @@
 }
 
-void MediaPlayerPrivate::doSeek() 
+void MediaPlayerPrivateQTKit::doSeek() 
 {
     QTTime qttime = createQTTime(m_seekTo);
@@ -773 +773 @@
 }
 
-void MediaPlayerPrivate::cancelSeek()
+void MediaPlayerPrivateQTKit::cancelSeek()
 {
     m_seekTo = -1;
@@ -779 +779 @@
 }
 
-void MediaPlayerPrivate::seekTimerFired(Timer<MediaPlayerPrivate>*)
+void MediaPlayerPrivateQTKit::seekTimerFired(Timer<MediaPlayerPrivateQTKit>*)
 {        
     if (!metaDataAvailable()|| !seeking() || currentTime() == m_seekTo) {
@@ -800 +800 @@
 }
 
-bool MediaPlayerPrivate::paused() const
+bool MediaPlayerPrivateQTKit::paused() const
 {
     if (!metaDataAvailable())
@@ -807 +807 @@
 }
 
-bool MediaPlayerPrivate::seeking() const
+bool MediaPlayerPrivateQTKit::seeking() const
 {
     if (!metaDataAvailable())
@@ -814 +814 @@
 }
 
-IntSize MediaPlayerPrivate::naturalSize() const
+IntSize MediaPlayerPrivateQTKit::naturalSize() const
 {
     if (!metaDataAvailable())
@@ -830 +830 @@
 }
 
-bool MediaPlayerPrivate::hasVideo() const
+bool MediaPlayerPrivateQTKit::hasVideo() const
 {
     if (!metaDataAvailable())
@@ -837 +837 @@
 }
 
-bool MediaPlayerPrivate::hasAudio() const
+bool MediaPlayerPrivateQTKit::hasAudio() const
 {
     if (!m_qtMovie)
@@ -844 +844 @@
 }
 
-bool MediaPlayerPrivate::supportsFullscreen() const
+bool MediaPlayerPrivateQTKit::supportsFullscreen() const
 {
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
@@ -854 +854 @@
 }
 
-void MediaPlayerPrivate::setVolume(float volume)
+void MediaPlayerPrivateQTKit::setVolume(float volume)
 {
     if (m_qtMovie)
@@ -860 +860 @@
 }
 
-bool MediaPlayerPrivate::hasClosedCaptions() const
+bool MediaPlayerPrivateQTKit::hasClosedCaptions() const
 {
     if (!metaDataAvailable())
@@ -867 +867 @@
 }
 
-void MediaPlayerPrivate::setClosedCaptionsVisible(bool closedCaptionsVisible)
+void MediaPlayerPrivateQTKit::setClosedCaptionsVisible(bool closedCaptionsVisible)
 {
     if (metaDataAvailable()) {
@@ -881 +881 @@
 }
 
-void MediaPlayerPrivate::setRate(float rate)
+void MediaPlayerPrivateQTKit::setRate(float rate)
 {
     if (m_qtMovie)
@@ -887 +887 @@
 }
 
-void MediaPlayerPrivate::setPreservesPitch(bool preservesPitch)
+void MediaPlayerPrivateQTKit::setPreservesPitch(bool preservesPitch)
 {
     if (!m_qtMovie)
@@ -905 +905 @@
 }
 
-PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const
+PassRefPtr<TimeRanges> MediaPlayerPrivateQTKit::buffered() const
 {
     RefPtr<TimeRanges> timeRanges = TimeRanges::create();
@@ -914 +914 @@
 }
 
-float MediaPlayerPrivate::maxTimeSeekable() const
+float MediaPlayerPrivateQTKit::maxTimeSeekable() const
 {
     if (!metaDataAvailable())
@@ -926 +926 @@
 }
 
-float MediaPlayerPrivate::maxTimeLoaded() const
+float MediaPlayerPrivateQTKit::maxTimeLoaded() const
 {
     if (!metaDataAvailable())
@@ -933 +933 @@
 }
 
-unsigned MediaPlayerPrivate::bytesLoaded() const
+unsigned MediaPlayerPrivateQTKit::bytesLoaded() const
 {
     float dur = duration();
@@ -941 +941 @@
 }
 
-unsigned MediaPlayerPrivate::totalBytes() const
+unsigned MediaPlayerPrivateQTKit::totalBytes() const
 {
     if (!metaDataAvailable())
@@ -948 +948 @@
 }
 
-void MediaPlayerPrivate::cancelLoad()
+void MediaPlayerPrivateQTKit::cancelLoad()
 {
     // FIXME: Is there a better way to check for this?
@@ -960 +960 @@
 }
 
-void MediaPlayerPrivate::cacheMovieScale()
+void MediaPlayerPrivateQTKit::cacheMovieScale()
 {
     NSSize initialSize = NSZeroSize;
@@ -985 +985 @@
 }
 
-bool MediaPlayerPrivate::isReadyForVideoSetup() const
+bool MediaPlayerPrivateQTKit::isReadyForVideoSetup() const
 {
     return m_readyState >= MediaPlayer::HaveMetadata && m_player->visible();
 }
 
-void MediaPlayerPrivate::prepareForRendering()
+void MediaPlayerPrivateQTKit::prepareForRendering()
 {
     if (m_isAllowedToRender)
@@ -1005 +1005 @@
 }
 
-void MediaPlayerPrivate::updateStates()
+void MediaPlayerPrivateQTKit::updateStates()
 {
     MediaPlayer::NetworkState oldNetworkState = m_networkState;
@@ -1120 +1120 @@
 }
 
-void MediaPlayerPrivate::loadStateChanged()
+void MediaPlayerPrivateQTKit::loadStateChanged()
 {
     if (!m_hasUnsupportedTracks)
@@ -1126 +1126 @@
 }
 
-void MediaPlayerPrivate::rateChanged()
+void MediaPlayerPrivateQTKit::rateChanged()
 {
     if (m_hasUnsupportedTracks)
@@ -1135 +1135 @@
 }
 
-void MediaPlayerPrivate::sizeChanged()
+void MediaPlayerPrivateQTKit::sizeChanged()
 {
     if (!m_hasUnsupportedTracks)
@@ -1141 +1141 @@
 }
 
-void MediaPlayerPrivate::timeChanged()
+void MediaPlayerPrivateQTKit::timeChanged()
 {
     if (m_hasUnsupportedTracks)
@@ -1157 +1157 @@
 }
 
-void MediaPlayerPrivate::didEnd()
+void MediaPlayerPrivateQTKit::didEnd()
 {
     if (m_hasUnsupportedTracks)
@@ -1179 +1179 @@
 }
 
-void MediaPlayerPrivate::setSize(const IntSize&) 
+void MediaPlayerPrivateQTKit::setSize(const IntSize&) 
 { 
     // Don't resize the view now because [view setFrame] also resizes the movie itself, and because
@@ -1190 +1190 @@
 }
 
-void MediaPlayerPrivate::setVisible(bool b)
+void MediaPlayerPrivateQTKit::setVisible(bool b)
 {
     if (m_visible != b) {
@@ -1201 +1201 @@
 }
 
-bool MediaPlayerPrivate::hasAvailableVideoFrame() const
+bool MediaPlayerPrivateQTKit::hasAvailableVideoFrame() const
 {
     // When using a QTMovieLayer return true as soon as the movie reaches QTMovieLoadStatePlayable 
@@ -1215 +1215 @@
 }
 
-void MediaPlayerPrivate::repaint()
+void MediaPlayerPrivateQTKit::repaint()
 {
     if (m_hasUnsupportedTracks)
@@ -1233 +1233 @@
 }
 
-void MediaPlayerPrivate::paintCurrentFrameInContext(GraphicsContext* context, const IntRect& r)
+void MediaPlayerPrivateQTKit::paintCurrentFrameInContext(GraphicsContext* context, const IntRect& r)
 {
     id qtVideoRenderer = m_qtVideoRenderer.get();
@@ -1247 +1247 @@
 }
 
-void MediaPlayerPrivate::paint(GraphicsContext* context, const IntRect& r)
+void MediaPlayerPrivateQTKit::paint(GraphicsContext* context, const IntRect& r)
 {
     if (context->paintingDisabled() || m_hasUnsupportedTracks)
@@ -1384 +1384 @@
 } 
 
-void MediaPlayerPrivate::getSupportedTypes(HashSet<String>& supportedTypes)
+void MediaPlayerPrivateQTKit::getSupportedTypes(HashSet<String>& supportedTypes)
 {
     supportedTypes = mimeModernTypesCache();
@@ -1397 +1397 @@
 } 
 
-MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& type, const String& codecs)
+MediaPlayer::SupportsType MediaPlayerPrivateQTKit::supportsType(const String& type, const String& codecs)
 {
     // Only return "IsSupported" if there is no codecs parameter for now as there is no way to ask QT if it supports an
@@ -1409 +1409 @@
 }
 
-bool MediaPlayerPrivate::isAvailable()
+bool MediaPlayerPrivateQTKit::isAvailable()
 {
 #ifdef BUILDING_ON_TIGER
@@ -1430 +1430 @@
 }
     
-void MediaPlayerPrivate::disableUnsupportedTracks()
+void MediaPlayerPrivateQTKit::disableUnsupportedTracks()
 {
     if (!m_qtMovie) {
@@ -1520 +1520 @@
 }
 
-void MediaPlayerPrivate::sawUnsupportedTracks()
+void MediaPlayerPrivateQTKit::sawUnsupportedTracks()
 {
     m_hasUnsupportedTracks = true;
@@ -1527 +1527 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-bool MediaPlayerPrivate::supportsAcceleratedRendering() const
+bool MediaPlayerPrivateQTKit::supportsAcceleratedRendering() const
 {
     // Also don't claim to support accelerated rendering when in the media document, as we will then render 
@@ -1534 +1534 @@
 }
 
-void MediaPlayerPrivate::acceleratedRenderingStateChanged()
+void MediaPlayerPrivateQTKit::acceleratedRenderingStateChanged()
 {
     // Set up or change the rendering path if necessary.
@@ -1541 +1541 @@
 #endif
 
-bool MediaPlayerPrivate::hasSingleSecurityOrigin() const
+bool MediaPlayerPrivateQTKit::hasSingleSecurityOrigin() const
 {
     // We tell quicktime to disallow resources that come from different origins
@@ -1548 +1548 @@
 }
 
-MediaPlayer::MovieLoadType MediaPlayerPrivate::movieLoadType() const
+MediaPlayer::MovieLoadType MediaPlayerPrivateQTKit::movieLoadType() const
 {
     if (!m_qtMovie)
@@ -1562 +1562 @@
 }
 
-void MediaPlayerPrivate::setPreload(MediaPlayer::Preload preload)
+void MediaPlayerPrivateQTKit::setPreload(MediaPlayer::Preload preload)
 {
     m_preload = preload;
@@ -1569 +1569 @@
 }
 
-float MediaPlayerPrivate::mediaTimeForTimeValue(float timeValue) const
+float MediaPlayerPrivateQTKit::mediaTimeForTimeValue(float timeValue) const
 {
     if (!metaDataAvailable())
@@ -1582 +1582 @@
 @implementation WebCoreMovieObserver
 
-- (id)initWithCallback:(MediaPlayerPrivate*)callback
+- (id)initWithCallback:(MediaPlayerPrivateQTKit*)callback
 {
     m_callback = callback;