Changeset 55962 in webkit

Timestamp:

Mar 13, 2010 5:43:33 AM (14 years ago)

Author:

krit@webkit.org

Message:

2010-03-13 Dirk Schulze <​krit@webkit.org>

No review, rolling out r55927.
​http://trac.webkit.org/changeset/55927
​https://bugs.webkit.org/show_bug.cgi?id=35793

Breaks Gtk build bots.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivate::MediaPlayerPrivate): (WebCore::MediaPlayerPrivate::load): (WebCore::MediaPlayerPrivate::setPreload):
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (6 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-13  Dirk Schulze  <krit@webkit.org>
+
+        No review, rolling out r55927.
+        http://trac.webkit.org/changeset/55927
+        https://bugs.webkit.org/show_bug.cgi?id=35793
+
+        Breaks Gtk build bots.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::load):
+        (WebCore::MediaPlayerPrivate::setPreload):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2010-03-12  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -315 +315 @@
     , m_maxTimeLoaded(0)
     , m_bufferingPercentage(0)
-    , m_preload(MediaPlayer::Auto)
-    , m_delayingLoad(false)
 {
     if (doGstInit())
@@ -371 +369 @@
 void MediaPlayerPrivate::load(const String& url)
 {
-    g_object_set(m_playBin, "uri", url.utf8().data(), NULL);
-
-    if (m_preload == MediaPlayer::None) {
-        m_delayingLoad = true;
-        return;
-    }
-
-    commitLoad();
-}
-
-void MediaPlayerPrivate::commitLoad()
-{
-    // GStreamer needs to have the pipeline set to a paused state to
-    // start providing anything useful.
-    gst_element_set_state(m_playBin, GST_STATE_PAUSED);
-
     LOG_VERBOSE(Media, "Load %s", url.utf8().data());
     if (m_networkState != MediaPlayer::Loading) {
@@ -396 +378 @@
         m_player->readyStateChanged();
     }
+
+    g_object_set(m_playBin, "uri", url.utf8().data(), NULL);
+
+    // GStreamer needs to have the pipeline set to a paused state to
+    // start providing anything useful.
+    gst_element_set_state(m_playBin, GST_STATE_PAUSED);
 }
 
@@ -415 +403 @@
     }
     return true;
-}
-
-void MediaPlayerPrivate::prepareToPlay()
-{
-    if (m_delayingLoad) {
-        m_delayingLoad = false;
-        commitLoad();
-    }
 }
 
@@ -1386 +1366 @@
     ASSERT(m_playBin);
 
-    m_preload = preload;
-
     GstPlayFlags flags;
     g_object_get(m_playBin, "flags", &flags, NULL);
@@ -1394 +1372 @@
     else
         g_object_set(m_playBin, "flags", flags | GST_PLAY_FLAG_DOWNLOAD, NULL);
-
-    if (m_delayingLoad && m_preload != MediaPlayer::None) {
-        m_delayingLoad = false;
-        commitLoad();
-    }
 }
 

trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -64 +64 @@
 
             void load(const String &url);
-            void commitLoad();
             void cancelLoad();
             bool loadNextLocation();
 
-            void prepareToPlay();
             void play();
             void pause();
@@ -170 +168 @@
             float m_maxTimeLoaded;
             int m_bufferingPercentage;
-            MediaPlayer::Preload m_preload;
-            bool m_delayingLoad;
     };
 }