<!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>[149691] trunk/Source/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/149691">149691</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2013-05-07 14:12:58 -0700 (Tue, 07 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Still possible to fire paint-related LayoutMilestones before CA has committed the 
changes
https://bugs.webkit.org/show_bug.cgi?id=115753
-and corresponding-
&lt;rdar://problem/13822315&gt;

Reviewed by Simon Fraser.

To ensure we wait for the CA commit, we should wait until the end of the runloop 
with a zero-delay timer.

* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::RenderLayerCompositor):
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
(WebCore::RenderLayerCompositor::paintRelatedMilestonesTimerFired):
(WebCore):
* rendering/RenderLayerCompositor.h:
(RenderLayerCompositor):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149690 => 149691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-07 21:09:48 UTC (rev 149690)
+++ trunk/Source/WebCore/ChangeLog        2013-05-07 21:12:58 UTC (rev 149691)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
+
+        Still possible to fire paint-related LayoutMilestones before CA has committed the 
+        changes
+        https://bugs.webkit.org/show_bug.cgi?id=115753
+        -and corresponding-
+        &lt;rdar://problem/13822315&gt;
+
+        Reviewed by Simon Fraser.
+
+        To ensure we wait for the CA commit, we should wait until the end of the runloop 
+        with a zero-delay timer.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::RenderLayerCompositor):
+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+        (WebCore::RenderLayerCompositor::paintRelatedMilestonesTimerFired):
+        (WebCore):
+        * rendering/RenderLayerCompositor.h:
+        (RenderLayerCompositor):
+
</ins><span class="cx"> 2013-05-07  Chris Fleizach  &lt;cfleizach@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Bug 115694 - Fix bad cast to RenderHTMLCanvas
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (149690 => 149691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2013-05-07 21:09:48 UTC (rev 149690)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2013-05-07 21:12:58 UTC (rev 149691)
</span><span class="lines">@@ -214,6 +214,7 @@
</span><span class="cx">     , m_layerFlushThrottlingEnabled(false)
</span><span class="cx">     , m_layerFlushThrottlingTemporarilyDisabledForInteraction(false)
</span><span class="cx">     , m_hasPendingLayerFlush(false)
</span><ins>+    , m_paintRelatedMilestonesTimer(this, &amp;RenderLayerCompositor::paintRelatedMilestonesTimerFired)
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx">     , m_rootLayerUpdateCount(0)
</span><span class="cx">     , m_obligateCompositedLayerCount(0)
</span><span class="lines">@@ -372,8 +373,8 @@
</span><span class="cx">     ASSERT(m_flushingLayers);
</span><span class="cx">     m_flushingLayers = false;
</span><span class="cx"> 
</span><del>-    if (frameView)
-        frameView-&gt;firePaintRelatedMilestones();
</del><ins>+    if (!m_paintRelatedMilestonesTimer.isActive())
+        m_paintRelatedMilestonesTimer.startOneShot(0);
</ins><span class="cx"> 
</span><span class="cx">     if (!m_viewportConstrainedLayersNeedingUpdate.isEmpty()) {
</span><span class="cx">         HashSet&lt;RenderLayer*&gt;::const_iterator end = m_viewportConstrainedLayersNeedingUpdate.end();
</span><span class="lines">@@ -3188,6 +3189,13 @@
</span><span class="cx">     scheduleLayerFlushNow();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer&lt;RenderLayerCompositor&gt;*)
+{
+    FrameView* frameView = m_renderView ? m_renderView-&gt;frameView() : 0;
+    if (frameView)
+        frameView-&gt;firePaintRelatedMilestones();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // USE(ACCELERATED_COMPOSITING)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (149690 => 149691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2013-05-07 21:09:48 UTC (rev 149690)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2013-05-07 21:12:58 UTC (rev 149691)
</span><span class="lines">@@ -385,6 +385,8 @@
</span><span class="cx">     void startLayerFlushTimerIfNeeded();
</span><span class="cx">     void layerFlushTimerFired(Timer&lt;RenderLayerCompositor&gt;*);
</span><span class="cx"> 
</span><ins>+    void paintRelatedMilestonesTimerFired(Timer&lt;RenderLayerCompositor&gt;*);
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx">     const char* logReasonsForCompositing(const RenderLayer*);
</span><span class="cx">     void logLayerInfo(const RenderLayer*, int depth);
</span><span class="lines">@@ -450,6 +452,8 @@
</span><span class="cx">     bool m_layerFlushThrottlingTemporarilyDisabledForInteraction;
</span><span class="cx">     bool m_hasPendingLayerFlush;
</span><span class="cx"> 
</span><ins>+    Timer&lt;RenderLayerCompositor&gt; m_paintRelatedMilestonesTimer;
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx">     int m_rootLayerUpdateCount;
</span><span class="cx">     int m_obligateCompositedLayerCount; // count of layer that have to be composited.
</span></span></pre>
</div>
</div>

</body>
</html>