<!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>[35994] 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/35994">35994</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2008-08-29 13:07:19 -0700 (Fri, 29 Aug 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Adele.

        Fix for https://bugs.webkit.org/show_bug.cgi?id=20525
        &lt;rdar://problem/6169301&gt;
        
        Return the size of the movie data instead of 1000. The value is used for the progress
        event &quot;total&quot; attribute.

       * media/progress-event-total-expected.txt: Added.
       * media/progress-event-total.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicswinQTMovieWincpp">trunk/WebCore/platform/graphics/win/QTMovieWin.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediaprogresseventtotalexpectedtxt">trunk/LayoutTests/media/progress-event-total-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaprogresseventtotalhtml">trunk/LayoutTests/media/progress-event-total.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (35993 => 35994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-08-29 15:57:44 UTC (rev 35993)
+++ trunk/LayoutTests/ChangeLog        2008-08-29 20:07:19 UTC (rev 35994)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2008-08-29  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Adele.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=20525
+        &lt;rdar://problem/6169301&gt;
+        
+        Return the size of the movie data instead of 1000. The value is used for the progress
+        event &quot;total&quot; attribute.
+
+       * media/progress-event-total-expected.txt: Added.
+       * media/progress-event-total.html: Added.
+
</ins><span class="cx"> 2008-08-28  Sam Weinig  &lt;sam@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Oliver Hunt.
</span></span></pre></div>
<a id="trunkLayoutTestsmediaprogresseventtotalexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/progress-event-total-expected.txt (0 => 35994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/progress-event-total-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/progress-event-total-expected.txt        2008-08-29 20:07:19 UTC (rev 35994)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+EVENT(begin) TEST(!event.lengthComputable &amp;&amp; event.loaded==0 &amp;&amp; event.total==0) OK
+EVENT(load) TEST(event.lengthComputable &amp;&amp; event.loaded&gt;0 &amp;&amp; event.total==239528) OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediaprogresseventtotalhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/progress-event-total.html (0 => 35994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/progress-event-total.html                                (rev 0)
+++ trunk/LayoutTests/media/progress-event-total.html        2008-08-29 20:07:19 UTC (rev 35994)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+&lt;video controls&gt;&lt;/video&gt;
+&lt;script src=video-test.js&gt;&lt;/script&gt;
+&lt;script&gt;
+waitForEventAndTest(&quot;begin&quot;, &quot;!event.lengthComputable &amp;&amp; event.loaded==0 &amp;&amp; event.total==0&quot;);
+waitForEventTestAndEnd(&quot;load&quot;, &quot;event.lengthComputable &amp;&amp; event.loaded&gt;0 &amp;&amp; event.total==239528&quot;);
+video.src = &quot;content/test.mp4&quot;;
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (35993 => 35994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-08-29 15:57:44 UTC (rev 35993)
+++ trunk/WebCore/ChangeLog        2008-08-29 20:07:19 UTC (rev 35994)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2008-08-29  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Adele.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=20525
+        &lt;rdar://problem/6169301&gt;
+        
+        Return the size of the movie data instead of 1000.
+        
+        Test: media/progress-event-total.html
+
+        * platform/graphics/win/QTMovieWin.cpp:
+        (QTMovieWin::dataSize):
+
</ins><span class="cx"> 2008-08-29  Holger Hans Peter Freyther  &lt;zecke@selfish.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Eric Seidel.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswinQTMovieWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/win/QTMovieWin.cpp (35993 => 35994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/win/QTMovieWin.cpp        2008-08-29 15:57:44 UTC (rev 35993)
+++ trunk/WebCore/platform/graphics/win/QTMovieWin.cpp        2008-08-29 20:07:19 UTC (rev 35994)
</span><span class="lines">@@ -425,8 +425,9 @@
</span><span class="cx"> 
</span><span class="cx"> unsigned QTMovieWin::dataSize() const
</span><span class="cx"> {
</span><del>-    // FIXME: How to get this?
-    return 1000;
</del><ins>+    if (!m_private-&gt;m_movie)
+        return 0;
+    return GetMovieDataSize(m_private-&gt;m_movie, 0, GetMovieDuration(m_private-&gt;m_movie));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> float QTMovieWin::maxTimeLoaded() const
</span></span></pre>
</div>
</div>

</body>
</html>