<!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>[149989] 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/149989">149989</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2013-05-12 23:40:52 -0700 (Sun, 12 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/149749">r149749</a>): Video becomes invisible when it starts playing at newyorkbygehry.com
https://bugs.webkit.org/show_bug.cgi?id=115963

Reviewed by Dean Jackson.

Source/WebCore:

Test: media/video-remove-insert-repaints.html

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::insertedInto): Set m_inActiveDocument when inserted into a document.
(WebCore::HTMLMediaElement::removedFrom): Fix logging.

LayoutTests:

* media/video-remove-insert-repaints.html: Added.
* media/video-remove-insert-repaints-expected.txt: Added.
* platform/mac/media/video-remove-insert-repaints-expected.png: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideoremoveinsertrepaintsexpectedtxt">trunk/LayoutTests/media/video-remove-insert-repaints-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideoremoveinsertrepaintshtml">trunk/LayoutTests/media/video-remove-insert-repaints.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideoremoveinsertrepaintsexpectedpng">trunk/LayoutTests/platform/mac/media/video-remove-insert-repaints-expected.png</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (149988 => 149989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-05-13 06:39:19 UTC (rev 149988)
+++ trunk/LayoutTests/ChangeLog        2013-05-13 06:40:52 UTC (rev 149989)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-05-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        REGRESSION (r149749): Video becomes invisible when it starts playing at newyorkbygehry.com
+        https://bugs.webkit.org/show_bug.cgi?id=115963
+
+        Reviewed by Dean Jackson.
+
+        * media/video-remove-insert-repaints.html: Added.
+        * media/video-remove-insert-repaints-expected.txt: Added.
+        * platform/mac/media/video-remove-insert-repaints-expected.png: Added.
+
</ins><span class="cx"> 2013-05-12  Jinwoo Song  &lt;jinwoo7.song@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL] Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideoremoveinsertrepaintsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-remove-insert-repaints-expected.txt (0 => 149989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-remove-insert-repaints-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/video-remove-insert-repaints-expected.txt        2013-05-13 06:40:52 UTC (rev 149989)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,8) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideoremoveinsertrepaintshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-remove-insert-repaints.html (0 => 149989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-remove-insert-repaints.html                                (rev 0)
+++ trunk/LayoutTests/media/video-remove-insert-repaints.html        2013-05-13 06:40:52 UTC (rev 149989)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;
+        &lt;title&gt;Test that video is rendered after being re-inserted into a document.&lt;/title&gt;
+
+        &lt;script src=media-file.js&gt;&lt;/script&gt;
+        &lt;script&gt;
+            if (window.testRunner)
+                testRunner.waitUntilDone();
+
+            function seeked()
+            {
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }
+
+            function playing()
+            {
+                video.pause();
+                video.currentTime = 0;
+            }
+
+            function canplaythrough()
+            {
+                document.body.removeChild(video);
+                document.body.offsetLeft;
+                document.body.appendChild(video);
+                video.play();
+            }
+            
+            function start()
+            {
+                video = document.getElementsByTagName('video')[0];
+                video.src = findMediaFile('video', 'content/test');
+                video.addEventListener('canplaythrough', canplaythrough);
+                video.addEventListener('playing', playing);
+                video.addEventListener('seeked', seeked);
+            }
+
+        &lt;/script&gt;
+
+    &lt;/head&gt;
+
+    &lt;body onload=&quot;start()&quot;&gt;
+
+        &lt;video width=320 height=240 &gt;&lt;/video&gt;
+
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideoremoveinsertrepaintsexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/media/video-remove-insert-repaints-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/media/video-remove-insert-repaints-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149988 => 149989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-13 06:39:19 UTC (rev 149988)
+++ trunk/Source/WebCore/ChangeLog        2013-05-13 06:40:52 UTC (rev 149989)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-05-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        REGRESSION (r149749): Video becomes invisible when it starts playing at newyorkbygehry.com
+        https://bugs.webkit.org/show_bug.cgi?id=115963
+
+        Reviewed by Dean Jackson.
+
+        Test: media/video-remove-insert-repaints.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::insertedInto): Set m_inActiveDocument when inserted into a document.
+        (WebCore::HTMLMediaElement::removedFrom): Fix logging.
+
</ins><span class="cx"> 2013-05-12  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Move sudden termination symbols to the Mac-only section
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (149988 => 149989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2013-05-13 06:39:19 UTC (rev 149988)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2013-05-13 06:40:52 UTC (rev 149989)
</span><span class="lines">@@ -578,19 +578,25 @@
</span><span class="cx"> Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode* insertionPoint)
</span><span class="cx"> {
</span><span class="cx">     LOG(Media, &quot;HTMLMediaElement::insertedInto&quot;);
</span><ins>+
</ins><span class="cx">     HTMLElement::insertedInto(insertionPoint);
</span><del>-    if (insertionPoint-&gt;inDocument() &amp;&amp; !getAttribute(srcAttr).isEmpty() &amp;&amp; m_networkState == NETWORK_EMPTY)
-        scheduleDelayedAction(LoadMediaResource);
</del><ins>+    if (insertionPoint-&gt;inDocument()) {
+        m_inActiveDocument = true;
+
+        if (m_networkState == NETWORK_EMPTY &amp;&amp; !getAttribute(srcAttr).isEmpty())
+            scheduleDelayedAction(LoadMediaResource);
+    }
+
</ins><span class="cx">     configureMediaControls();
</span><span class="cx">     return InsertionDone;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)
</span><span class="cx"> {
</span><ins>+    LOG(Media, &quot;HTMLMediaElement::removedFrom&quot;);
+
</ins><span class="cx">     m_inActiveDocument = false;
</span><del>-
</del><span class="cx">     if (insertionPoint-&gt;inDocument()) {
</span><del>-        LOG(Media, &quot;HTMLMediaElement::removedFrom&quot;);
</del><span class="cx">         configureMediaControls();
</span><span class="cx">         if (m_networkState &gt; NETWORK_EMPTY)
</span><span class="cx">             pause();
</span></span></pre>
</div>
</div>

</body>
</html>