[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[vestbo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7f803ca2da3af13ff6e021f0fd0c19eacd58a378
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 08:32:11 2010 +0000

    Implement MediaPlayerPrivate::platformMedia() for the Qt port
    
    Reviewed by Andreas Kling.
    
    https://bugs.webkit.org/show_bug.cgi?id=45264
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c67b1f9..8947cfd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-06  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Implement MediaPlayerPrivate::platformMedia() for the Qt port
+
+        https://bugs.webkit.org/show_bug.cgi?id=45264
+
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivate::platformMedia):
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+
 2010-09-08  Zoltan Herczeg  <zherczeg at webkit.org>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/graphics/MediaPlayer.h b/WebCore/platform/graphics/MediaPlayer.h
index 6823d9d..0bebf52 100644
--- a/WebCore/platform/graphics/MediaPlayer.h
+++ b/WebCore/platform/graphics/MediaPlayer.h
@@ -70,6 +70,7 @@ struct PlatformMedia {
         QTMovieVisualContextType,
         GStreamerGWorldType,
         ChromiumMediaPlayerType,
+        QtMediaPlayerType,
     } type;
 
     union {
@@ -78,6 +79,7 @@ struct PlatformMedia {
         QTMovieVisualContext* qtMovieVisualContext;
         GStreamerGWorld* gstreamerGWorld;
         MediaPlayerPrivateInterface* chromiumMediaPlayer;
+        MediaPlayerPrivateInterface* qtMediaPlayer;
     } media;
 };
 
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 4ad5571..605dcb7 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -604,6 +604,14 @@ PlatformLayer* MediaPlayerPrivate::platformLayer() const
 }
 #endif
 
+PlatformMedia MediaPlayerPrivate::platformMedia() const
+{
+    PlatformMedia pm;
+    pm.type = PlatformMedia::QtMediaPlayerType;
+    pm.media.qtMediaPlayer = const_cast<MediaPlayerPrivate*>(this);
+    return pm;
+}
+
 } // namespace WebCore
 
 #include "moc_MediaPlayerPrivateQt.cpp"
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
index 165efde..117187d 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
@@ -99,6 +99,7 @@ public:
     virtual PlatformLayer* platformLayer() const;
 #endif
 
+    virtual PlatformMedia platformMedia() const;
 private slots:
     void mediaStatusChanged(QMediaPlayer::MediaStatus);
     void handleError(QMediaPlayer::Error);

-- 
WebKit Debian packaging