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

<h3>Log Message</h3>
<pre>2008-08-29  Eric Carlson  &lt;eric.carlson@apple.com&gt;

        Reviewed by Adele.

        Fix for &lt;rdar://problem/6093767&gt;
        https://bugs.webkit.org/show_bug.cgi?id=20526

        Don't allow video to render until unsupported track types have been disabled.

        * platform/graphics/win/QTMovieWin.cpp:
        (QTMovieWinPrivate::task):
        (QTMovieWinPrivate::drawingComplete):
        (QTMovieWinPrivate::clearGWorld):</pre>

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

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (35994 => 35995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-08-29 20:07:19 UTC (rev 35994)
+++ trunk/WebCore/ChangeLog        2008-08-29 20:24:50 UTC (rev 35995)
</span><span class="lines">@@ -2,6 +2,20 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Adele.
</span><span class="cx"> 
</span><ins>+        Fix for &lt;rdar://problem/6093767&gt;
+        https://bugs.webkit.org/show_bug.cgi?id=20526
+
+        Don't allow video to render until unsupported track types have been disabled.
+
+        * platform/graphics/win/QTMovieWin.cpp:
+        (QTMovieWinPrivate::task):
+        (QTMovieWinPrivate::drawingComplete):
+        (QTMovieWinPrivate::clearGWorld):
+
+2008-08-29  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Adele.
+
</ins><span class="cx">         Fix for https://bugs.webkit.org/show_bug.cgi?id=20525
</span><span class="cx">         &lt;rdar://problem/6169301&gt;
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswinQTMovieWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/win/QTMovieWin.cpp (35994 => 35995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/win/QTMovieWin.cpp        2008-08-29 20:07:19 UTC (rev 35994)
+++ trunk/WebCore/platform/graphics/win/QTMovieWin.cpp        2008-08-29 20:24:50 UTC (rev 35995)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">     void updateGWorld();
</span><span class="cx">     void createGWorld();
</span><span class="cx">     void deleteGWorld();
</span><ins>+    void clearGWorld();
</ins><span class="cx"> 
</span><span class="cx">     void setSize(int, int);
</span><span class="cx"> 
</span><span class="lines">@@ -195,6 +196,12 @@
</span><span class="cx">         // This is different from QTKit API and seems strange.
</span><span class="cx">         long loadState = m_loadError ? kMovieLoadStateError : GetMovieLoadState(m_movie);
</span><span class="cx">         if (loadState != m_loadState) {
</span><ins>+
+            // we only need to erase the movie gworld when the load state changes to loaded while it
+            //  is visible as the gworld is destroyed/created when visibility changes
+            if (loadState &gt;= QTMovieLoadStateLoaded &amp;&amp; m_loadState &lt; QTMovieLoadStateLoaded &amp;&amp; m_visible)
+                clearGWorld();
+
</ins><span class="cx">             m_loadState = loadState;
</span><span class="cx">             if (!m_movieController &amp;&amp; m_loadState &gt;= kMovieLoadStateLoaded)
</span><span class="cx">                 createMovieController();
</span><span class="lines">@@ -252,7 +259,7 @@
</span><span class="cx"> 
</span><span class="cx"> void QTMovieWinPrivate::drawingComplete()
</span><span class="cx"> {
</span><del>-    if (!m_gWorld)
</del><ins>+    if (!m_gWorld || m_loadState &lt; kMovieLoadStateLoaded)
</ins><span class="cx">         return;
</span><span class="cx">     m_client-&gt;movieNewImageAvailable(m_movieWin);
</span><span class="cx"> }
</span><span class="lines">@@ -301,6 +308,26 @@
</span><span class="cx">     SetMovieBox(m_movie, &amp;bounds);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void QTMovieWinPrivate::clearGWorld()
+{
+    if (!m_movie||!m_gWorld)
+        return;
+
+    GrafPtr savePort;
+    GetPort(&amp;savePort); 
+    MacSetPort((GrafPtr)m_gWorld);
+
+    Rect bounds; 
+    bounds.top = 0;
+    bounds.left = 0; 
+    bounds.right = m_gWorldWidth;
+    bounds.bottom = m_gWorldHeight;
+    EraseRect(&amp;bounds);
+
+    MacSetPort(savePort);
+}
+
+
</ins><span class="cx"> void QTMovieWinPrivate::setSize(int width, int height)
</span><span class="cx"> {
</span><span class="cx">     if (m_width == width &amp;&amp; m_height == height)
</span></span></pre>
</div>
</div>

</body>
</html>