[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ee4961368dfc54753044f0f81805a6b69edc85fb
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 09:01:54 2010 +0000

    2010-03-09  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GStreamer] player code cleanups
            https://bugs.webkit.org/show_bug.cgi?id=35868
    
            Cleaned up the private instance variables of the player.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
            (WebCore::MediaPlayerPrivate::fillTimerFired):
            (WebCore::MediaPlayerPrivate::mediaLocationChanged):
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b3bad7b..ec2ef39 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -5,6 +5,21 @@
         [GStreamer] player code cleanups
         https://bugs.webkit.org/show_bug.cgi?id=35868
 
+        Cleaned up the private instance variables of the player.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::fillTimerFired):
+        (WebCore::MediaPlayerPrivate::mediaLocationChanged):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
+2010-03-09  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GStreamer] player code cleanups
+        https://bugs.webkit.org/show_bug.cgi?id=35868
+
         Splitted GOwnPtrGtk.{cpp,h} to GOwnPtr{Soup,GStreamer}.{cpp,h}.
 
         * GNUmakefile.am:
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 3e02633..59731b9 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -291,7 +291,6 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
     , m_startedBuffering(false)
     , m_fillTimer(this, &MediaPlayerPrivate::fillTimerFired)
     , m_maxTimeLoaded(0)
-    , m_fillStatus(0)
 {
     if (doGstInit())
         createGSTPlayBin();
@@ -670,16 +669,15 @@ void MediaPlayerPrivate::fillTimerFired(Timer<MediaPlayerPrivate>*)
     }
 
     gint64 start, stop;
+    gdouble fillStatus = 100.0;
 
     gst_query_parse_buffering_range(query, 0, &start, &stop, 0);
     gst_query_unref(query);
 
     if (stop != -1)
-        m_fillStatus = 100.0 * stop / GST_FORMAT_PERCENT_MAX;
-    else
-        m_fillStatus = 100.0;
+        fillStatus = 100.0 * stop / GST_FORMAT_PERCENT_MAX;
 
-    LOG_VERBOSE(Media, "Download buffer filled up to %f%%", m_fillStatus);
+    LOG_VERBOSE(Media, "Download buffer filled up to %f%%", fillStatus);
 
     if (!m_mediaDuration)
         durationChanged();
@@ -687,11 +685,11 @@ void MediaPlayerPrivate::fillTimerFired(Timer<MediaPlayerPrivate>*)
     // Update maxTimeLoaded only if the media duration is
     // available. Otherwise we can't compute it.
     if (m_mediaDuration) {
-        m_maxTimeLoaded = static_cast<float>((m_fillStatus * m_mediaDuration) / 100.0);
+        m_maxTimeLoaded = static_cast<float>((fillStatus * m_mediaDuration) / 100.0);
         LOG_VERBOSE(Media, "Updated maxTimeLoaded: %f", m_maxTimeLoaded);
     }
 
-    if (m_fillStatus != 100.0) {
+    if (fillStatus != 100.0) {
         updateStates();
         return;
     }
@@ -934,7 +932,7 @@ void MediaPlayerPrivate::mediaLocationChanged(GstMessage* message)
         const GValue* locations = gst_structure_get_value(m_mediaLocations, "locations");
 
         if (locations)
-            m_mediaLocationCurrentIndex = gst_value_list_get_size(locations) -1;
+            m_mediaLocationCurrentIndex = static_cast<int>(gst_value_list_get_size(locations)) -1;
 
         loadNextLocation();
     }
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
index 39f6e4c..073a45d 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
@@ -154,17 +154,16 @@ class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
             IntSize m_size;
             GstBuffer* m_buffer;
             GstStructure* m_mediaLocations;
-            gint m_mediaLocationCurrentIndex;
+            int m_mediaLocationCurrentIndex;
             bool m_resetPipeline;
             bool m_paused;
             bool m_seeking;
             float m_playbackRate;
             bool m_errorOccured;
-            gfloat m_mediaDuration;
+            float m_mediaDuration;
             bool m_startedBuffering;
             Timer<MediaPlayerPrivate> m_fillTimer;
             float m_maxTimeLoaded;
-            gdouble m_fillStatus;
     };
 }
 

-- 
WebKit Debian packaging