[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 7106559092759ae980db2e1aa857e9fa4ece5360
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 17:03:47 2010 +0000

    [Qt] Rename member variable in MediaPlayerPrivateQt
    
    Reviewed by Simon Hausmann.
    
    * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
    * platform/graphics/qt/MediaPlayerPrivateQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 592e544..73e78f3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-28  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Rename member variable in MediaPlayerPrivateQt 
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+
 2010-09-28  Andras Becsi  <abecsi at webkit.org>
 
         [Gtk] Build fix. Remove leftover trailing backslash.
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 1d10cb3..1a31d1e 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -86,7 +86,7 @@ MediaPlayer::SupportsType MediaPlayerPrivateQt::supportsType(const String& mime,
 }
 
 MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player)
-    : m_player(player)
+    : m_webCorePlayer(player)
     , m_mediaPlayer(new QMediaPlayer)
     , m_mediaPlayerControl(0)
     , m_videoItem(new QGraphicsVideoItem)
@@ -167,20 +167,20 @@ void MediaPlayerPrivateQt::commitLoad(const String& url)
     // We are now loading
     if (m_networkState != MediaPlayer::Loading) {
         m_networkState = MediaPlayer::Loading;
-        m_player->networkStateChanged();
+        m_webCorePlayer->networkStateChanged();
     }
 
     // And we don't have any data yet
     if (m_readyState != MediaPlayer::HaveNothing) {
         m_readyState = MediaPlayer::HaveNothing;
-        m_player->readyStateChanged();
+        m_webCorePlayer->readyStateChanged();
     }
 
     const QUrl rUrl = QUrl(QString(url));
     const QString scheme = rUrl.scheme().toLower();
 
     // Grab the client media element
-    HTMLMediaElement* element = static_cast<HTMLMediaElement*>(m_player->mediaPlayerClient());
+    HTMLMediaElement* element = static_cast<HTMLMediaElement*>(m_webCorePlayer->mediaPlayerClient());
 
     // Construct the media content with a network request if the resource is http[s]
     if (scheme == "http" || scheme == "https") {
@@ -439,7 +439,7 @@ void MediaPlayerPrivateQt::stateChanged(QMediaPlayer::State state)
 
 void MediaPlayerPrivateQt::nativeSizeChanged(const QSizeF&)
 {
-    m_player->sizeChanged();
+    m_webCorePlayer->sizeChanged();
 }
 
 void MediaPlayerPrivateQt::queuedSeekTimeout()
@@ -459,7 +459,7 @@ void MediaPlayerPrivateQt::seekTimeout()
 {
     // If we haven't heard anything, assume the seek succeeded
     if (m_isSeeking) {
-        m_player->timeChanged();
+        m_webCorePlayer->timeChanged();
         m_isSeeking = false;
     }
 }
@@ -468,7 +468,7 @@ void MediaPlayerPrivateQt::positionChanged(qint64)
 {
     // Only propogate this event if we are seeking
     if (m_isSeeking && m_queuedSeek == -1) {
-        m_player->timeChanged();
+        m_webCorePlayer->timeChanged();
         m_isSeeking = false;
     }
 }
@@ -480,17 +480,17 @@ void MediaPlayerPrivateQt::bufferStatusChanged(int)
 
 void MediaPlayerPrivateQt::durationChanged(qint64)
 {
-    m_player->durationChanged();
+    m_webCorePlayer->durationChanged();
 }
 
 void MediaPlayerPrivateQt::volumeChanged(int volume)
 {
-    m_player->volumeChanged(static_cast<float>(volume) / 100.0);
+    m_webCorePlayer->volumeChanged(static_cast<float>(volume) / 100.0);
 }
 
 void MediaPlayerPrivateQt::mutedChanged(bool muted)
 {
-    m_player->muteChanged(muted);
+    m_webCorePlayer->muteChanged(muted);
 }
 
 void MediaPlayerPrivateQt::updateStates()
@@ -538,10 +538,10 @@ void MediaPlayerPrivateQt::updateStates()
     // Breaking this invariant will cause the resource selection algorithm for multiple
     // sources to fail.
     if (m_readyState != oldReadyState)
-        m_player->readyStateChanged();
+        m_webCorePlayer->readyStateChanged();
 
     if (m_networkState != oldNetworkState)
-        m_player->networkStateChanged();
+        m_webCorePlayer->networkStateChanged();
 }
 
 void MediaPlayerPrivateQt::setSize(const IntSize& size)
@@ -582,13 +582,14 @@ void MediaPlayerPrivateQt::paint(GraphicsContext* context, const IntRect& rect)
 
 void MediaPlayerPrivateQt::repaint()
 {
-    m_player->repaint();
+    m_webCorePlayer->repaint();
 }
 
 #if USE(ACCELERATED_COMPOSITING)
 void MediaPlayerPrivateQt::acceleratedRenderingStateChanged()
 {
-    bool composited = m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player);
+    MediaPlayerClient* client = m_webCorePlayer->mediaPlayerClient();
+    bool composited = client->mediaPlayerRenderingCanBeAccelerated(m_webCorePlayer);
     if (composited == m_composited)
         return;
 
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
index 620b824..179bf2a 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
@@ -120,7 +120,7 @@ private:
 private:
     MediaPlayerPrivateQt(MediaPlayer*);
 
-    MediaPlayer* m_player;
+    MediaPlayer* m_webCorePlayer;
     QMediaPlayer* m_mediaPlayer;
     QMediaPlayerControl* m_mediaPlayerControl;
     QGraphicsVideoItem* m_videoItem;

-- 
WebKit Debian packaging