<!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>[46581] 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/46581">46581</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2009-07-30 09:05:02 -0700 (Thu, 30 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-30  Eric Carlson  &lt;eric.carlson@apple.com&gt;

        Reviewed by Simon Fraser.

        Video elements fires another &quot;load&quot; event when attached to DOM
        https://bugs.webkit.org/show_bug.cgi?id=27623

        Test: media/media-load-event.html

        * html/HTMLMediaElement.cpp:
        (WebCore::HTMLMediaElement::insertedIntoDocument):
            Only schedule load when element's network state is NETWORK_EMPTY.

2009-07-30  Eric Carlson  &lt;eric.carlson@apple.com&gt;

        Reviewed by Simon Fraser.

        Video elements fires another &quot;load&quot; event when attached to DOM
        https://bugs.webkit.org/show_bug.cgi?id=27623

        * media/media-load-event-expected.txt: Added.
        * media/media-load-event.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="#trunkWebCorehtmlHTMLMediaElementcpp">trunk/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamedialoadeventexpectedtxt">trunk/LayoutTests/media/media-load-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamedialoadeventhtml">trunk/LayoutTests/media/media-load-event.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (46580 => 46581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-07-30 14:07:03 UTC (rev 46580)
+++ trunk/LayoutTests/ChangeLog        2009-07-30 16:05:02 UTC (rev 46581)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-07-30  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        Video elements fires another &quot;load&quot; event when attached to DOM
+        https://bugs.webkit.org/show_bug.cgi?id=27623
+
+        * media/media-load-event-expected.txt: Added.
+        * media/media-load-event.html: Added.
+
</ins><span class="cx"> 2009-07-29  Jian Li  &lt;jianli@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamedialoadeventexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-load-event-expected.txt (0 => 46581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-load-event-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/media-load-event-expected.txt        2009-07-30 16:05:02 UTC (rev 46581)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Test that media file is not reloaded when an element is inserted into the DOM.
+
+RUN(media = document.createElement('audio'))
+RUN(media.src = 'content/test.wav')
+RUN(media.load())
+
+EVENT(loadstart)
+EVENT(durationchange)
+EVENT(loadeddata)
+EVENT(load)
+
+RUN(document.getElementById('parent').appendChild(media))
+RUN(media.play())
+
+EVENT(play)
+EVENT(playing)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamedialoadeventhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-load-event.html (0 => 46581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-load-event.html                                (rev 0)
+++ trunk/LayoutTests/media/media-load-event.html        2009-07-30 16:05:02 UTC (rev 46581)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script src=video-test.js&gt;&lt;/script&gt;
+
+        &lt;script&gt;
+
+            function loaded()
+            {
+                consoleWrite(&quot;EVENT(load)&quot;);
+                consoleWrite(&quot;&quot;);
+                run(&quot;document.getElementById('parent').appendChild(media)&quot;);
+                run(&quot;media.play()&quot;);
+                window.setTimeout(endTest, 250);
+                consoleWrite(&quot;&quot;);
+            }
+
+            function start()
+            {
+                run(&quot;media = document.createElement('audio')&quot;);
+
+                media.onload = loaded;
+
+                waitForEvent(&quot;loadstart&quot;);
+                waitForEvent(&quot;waiting&quot;);
+                waitForEvent(&quot;ratechange&quot;);
+                waitForEvent(&quot;durationchange&quot;);
+                waitForEvent(&quot;pause&quot;);
+                waitForEvent(&quot;play&quot;);
+                waitForEvent(&quot;playing&quot;);
+                waitForEvent('loadeddata');
+
+                run(&quot;media.src = 'content/test.wav'&quot;);
+                run(&quot;media.load()&quot;);
+
+                consoleWrite(&quot;&quot;);
+            }
+
+        &lt;/script&gt;
+    &lt;/head&gt;
+
+    &lt;body onload=&quot;start()&quot;&gt;
+
+    &lt;p&gt;Test that media file is not reloaded when an element is inserted into the DOM.&lt;/p&gt;
+
+    &lt;div id=&quot;parent&quot;&gt;&lt;/div&gt;
+    
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46580 => 46581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-30 14:07:03 UTC (rev 46580)
+++ trunk/WebCore/ChangeLog        2009-07-30 16:05:02 UTC (rev 46581)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-07-30  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        Video elements fires another &quot;load&quot; event when attached to DOM
+        https://bugs.webkit.org/show_bug.cgi?id=27623
+
+        Test: media/media-load-event.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::insertedIntoDocument):
+            Only schedule load when element's network state is NETWORK_EMPTY.
+
</ins><span class="cx"> 2009-07-30  Anton Muhin  &lt;antonm@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLMediaElement.cpp (46580 => 46581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLMediaElement.cpp        2009-07-30 14:07:03 UTC (rev 46580)
+++ trunk/WebCore/html/HTMLMediaElement.cpp        2009-07-30 16:05:02 UTC (rev 46581)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> void HTMLMediaElement::insertedIntoDocument()
</span><span class="cx"> {
</span><span class="cx">     HTMLElement::insertedIntoDocument();
</span><del>-    if (!src().isEmpty())
</del><ins>+    if (!src().isEmpty() &amp;&amp; m_networkState == NETWORK_EMPTY)
</ins><span class="cx">         scheduleLoad();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>