<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55995] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/55995">55995</a></dd>
<dt>Author</dt> <dd>kov@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-15 08:20:22 -0700 (Mon, 15 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-12  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;

        Reviewed by Eric Carlson.

        media/video-preload.html fails
        https://bugs.webkit.org/show_bug.cgi?id=35793

        Only effectively load, and start buffering when playing, or when
        the preload attribute is set.

        Test: media/video-preload.html

        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
        (WebCore::MediaPlayerPrivate::load):
        (WebCore::MediaPlayerPrivate::commitLoad):
        (WebCore::MediaPlayerPrivate::prepareToPlay):
        (WebCore::MediaPlayerPrivate::setPreload):
        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkSkipped">trunk/LayoutTests/platform/gtk/Skipped</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (55994 => 55995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-15 14:46:56 UTC (rev 55994)
+++ trunk/LayoutTests/ChangeLog        2010-03-15 15:20:22 UTC (rev 55995)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2010-03-12  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
+
+        Reviewed by Eric Carlson.
+
+        media/video-preload.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=35793
+
+        Unskip the test that now passes.
+
+        * platform/gtk/Skipped:
+
</ins><span class="cx"> 2010-03-15  Shu Chang  &lt;Chang.Shu@nokia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Holger Freyther.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkSkipped"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/Skipped (55994 => 55995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/Skipped        2010-03-15 14:46:56 UTC (rev 55994)
+++ trunk/LayoutTests/platform/gtk/Skipped        2010-03-15 15:20:22 UTC (rev 55995)
</span><span class="lines">@@ -5808,9 +5808,6 @@
</span><span class="cx"> fast/dom/Geolocation/permission-denied-stops-watches.html
</span><span class="cx"> fast/dom/Geolocation/permission-denied.html
</span><span class="cx"> 
</span><del>-# https://bugs.webkit.org/show_bug.cgi?id=35793
-media/video-preload.html
-
</del><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=35824 - Doesn't apply to platforms that don't enforce the CFNetwork-style 3rd party cookie policy
</span><span class="cx"> http/tests/cookies/third-party-cookie-relaxing.html
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (55994 => 55995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-15 14:46:56 UTC (rev 55994)
+++ trunk/WebCore/ChangeLog        2010-03-15 15:20:22 UTC (rev 55995)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2010-03-12  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
+
+        Reviewed by Eric Carlson.
+
+        media/video-preload.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=35793
+
+        Only effectively load, and start buffering when playing, or when
+        the preload attribute is set.
+
+        Test: media/video-preload.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::load):
+        (WebCore::MediaPlayerPrivate::commitLoad):
+        (WebCore::MediaPlayerPrivate::prepareToPlay):
+        (WebCore::MediaPlayerPrivate::setPreload):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2010-03-15  Shu Chang  &lt;Chang.Shu@nokia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Holger Freyther.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (55994 => 55995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2010-03-15 14:46:56 UTC (rev 55994)
+++ trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2010-03-15 15:20:22 UTC (rev 55995)
</span><span class="lines">@@ -314,6 +314,8 @@
</span><span class="cx">     , m_fillTimeoutId(0)
</span><span class="cx">     , m_maxTimeLoaded(0)
</span><span class="cx">     , m_bufferingPercentage(0)
</span><ins>+    , m_preload(MediaPlayer::Auto)
+    , m_delayingLoad(false)
</ins><span class="cx"> {
</span><span class="cx">     if (doGstInit())
</span><span class="cx">         createGSTPlayBin();
</span><span class="lines">@@ -368,7 +370,26 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::load(const String&amp; url)
</span><span class="cx"> {
</span><ins>+    g_object_set(m_playBin, &quot;uri&quot;, url.utf8().data(), NULL);
+
</ins><span class="cx">     LOG_VERBOSE(Media, &quot;Load %s&quot;, url.utf8().data());
</span><ins>+
+    if (m_preload == MediaPlayer::None) {
+        LOG_VERBOSE(Media, &quot;Delaying load.&quot;);
+        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, &quot;Committing load.&quot;);
</ins><span class="cx">     if (m_networkState != MediaPlayer::Loading) {
</span><span class="cx">         m_networkState = MediaPlayer::Loading;
</span><span class="cx">         m_player-&gt;networkStateChanged();
</span><span class="lines">@@ -377,12 +398,6 @@
</span><span class="cx">         m_readyState = MediaPlayer::HaveNothing;
</span><span class="cx">         m_player-&gt;readyStateChanged();
</span><span class="cx">     }
</span><del>-
-    g_object_set(m_playBin, &quot;uri&quot;, 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);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool MediaPlayerPrivate::changePipelineState(GstState newState)
</span><span class="lines">@@ -404,6 +419,14 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void MediaPlayerPrivate::prepareToPlay()
+{
+    if (m_delayingLoad) {
+        m_delayingLoad = false;
+        commitLoad();
+    }
+}
+
</ins><span class="cx"> void MediaPlayerPrivate::play()
</span><span class="cx"> {
</span><span class="cx">     if (changePipelineState(GST_STATE_PLAYING))
</span><span class="lines">@@ -1366,12 +1389,19 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_playBin);
</span><span class="cx"> 
</span><ins>+    m_preload = preload;
+
</ins><span class="cx">     GstPlayFlags flags;
</span><span class="cx">     g_object_get(m_playBin, &quot;flags&quot;, &amp;flags, NULL);
</span><span class="cx">     if (preload == MediaPlayer::None)
</span><span class="cx">         g_object_set(m_playBin, &quot;flags&quot;, flags &amp; ~GST_PLAY_FLAG_DOWNLOAD, NULL);
</span><span class="cx">     else
</span><span class="cx">         g_object_set(m_playBin, &quot;flags&quot;, flags | GST_PLAY_FLAG_DOWNLOAD, NULL);
</span><ins>+
+    if (m_delayingLoad &amp;&amp; m_preload != MediaPlayer::None) {
+        m_delayingLoad = false;
+        commitLoad();
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::createGSTPlayBin()
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (55994 => 55995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h        2010-03-15 14:46:56 UTC (rev 55994)
+++ trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h        2010-03-15 15:20:22 UTC (rev 55995)
</span><span class="lines">@@ -63,9 +63,11 @@
</span><span class="cx">             bool hasAudio() const;
</span><span class="cx"> 
</span><span class="cx">             void load(const String &amp;url);
</span><ins>+            void commitLoad();
</ins><span class="cx">             void cancelLoad();
</span><span class="cx">             bool loadNextLocation();
</span><span class="cx"> 
</span><ins>+            void prepareToPlay();
</ins><span class="cx">             void play();
</span><span class="cx">             void pause();
</span><span class="cx"> 
</span><span class="lines">@@ -167,6 +169,8 @@
</span><span class="cx">             guint m_fillTimeoutId;
</span><span class="cx">             float m_maxTimeLoaded;
</span><span class="cx">             int m_bufferingPercentage;
</span><ins>+            MediaPlayer::Preload m_preload;
+            bool m_delayingLoad;
</ins><span class="cx">     };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>