[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 2d39873a5353700c409054103994cd5274827625
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 11:50:51 2010 +0000

    Minor cleanup of MediaPlayerPrivateQt
    
    Reviewed by Simon Hausmann.
    
    * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
    (WebCore::MediaPlayerPrivateQt::MediaPlayerPrivateQt):
    (WebCore::MediaPlayerPrivateQt::currentTime):
    (WebCore::MediaPlayerPrivateQt::positionChanged):
    (WebCore::MediaPlayerPrivateQt::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2331832..31fd45d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-30  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Minor cleanup of MediaPlayerPrivateQt
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::MediaPlayerPrivateQt):
+        (WebCore::MediaPlayerPrivateQt::currentTime):
+        (WebCore::MediaPlayerPrivateQt::positionChanged):
+        (WebCore::MediaPlayerPrivateQt::paint):
+
 2010-09-30  Jochen Eisinger  <jochen at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 1a31d1e..3cb98c6 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -125,8 +125,7 @@ MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player)
            this, SLOT(nativeSizeChanged(QSizeF)));
 
     // Grab the player control
-    QMediaService* service = m_mediaPlayer->service();
-    if (service) {
+    if (QMediaService* service = m_mediaPlayer->service()) {
         m_mediaPlayerControl = qobject_cast<QMediaPlayerControl *>(
                 service->requestControl(QMediaPlayerControl_iid));
     }
@@ -330,8 +329,7 @@ float MediaPlayerPrivateQt::duration() const
 
 float MediaPlayerPrivateQt::currentTime() const
 {
-    float currentTime = m_mediaPlayer->position() / 1000.0f;
-    return currentTime;
+    return m_mediaPlayer->position() / 1000.0f;
 }
 
 PassRefPtr<TimeRanges> MediaPlayerPrivateQt::buffered() const
@@ -466,7 +464,7 @@ void MediaPlayerPrivateQt::seekTimeout()
 
 void MediaPlayerPrivateQt::positionChanged(qint64)
 {
-    // Only propogate this event if we are seeking
+    // Only propagate this event if we are seeking
     if (m_isSeeking && m_queuedSeek == -1) {
         m_webCorePlayer->timeChanged();
         m_isSeeking = false;
@@ -573,10 +571,7 @@ void MediaPlayerPrivateQt::paint(GraphicsContext* context, const IntRect& rect)
     if (!m_isVisible)
         return;
 
-    // Grab the painter and widget
     QPainter* painter = context->platformContext();
-
-    // Render the video
     m_videoScene->render(painter, QRectF(QRect(rect)), m_videoItem->sceneBoundingRect());
 }
 

-- 
WebKit Debian packaging