<!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>[175781] 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/175781">175781</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-11-08 15:50:43 -0800 (Sat, 08 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't try to schedule a GraphicsLayer flush when propagating changes to replicas inside a flush
https://bugs.webkit.org/show_bug.cgi?id=138532
Reviewed by Dan Bernstein.
When changing masks on replica layers with certain layer configurations,
it was possible to hit an assertion that a flush was being scheduled when already
flushing, via propagateLayerChangeToReplicas(). Fix by passing the scheduleFlush
flag along.
Not testable with current GraphicsLayer configurations.
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/ca/GraphicsLayerCA.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175780 => 175781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-08 20:27:13 UTC (rev 175780)
+++ trunk/Source/WebCore/ChangeLog 2014-11-08 23:50:43 UTC (rev 175781)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-11-08 Simon Fraser <simon.fraser@apple.com>
+
+ Don't try to schedule a GraphicsLayer flush when propagating changes to replicas inside a flush
+ https://bugs.webkit.org/show_bug.cgi?id=138532
+
+ Reviewed by Dan Bernstein.
+
+ When changing masks on replica layers with certain layer configurations,
+ it was possible to hit an assertion that a flush was being scheduled when already
+ flushing, via propagateLayerChangeToReplicas(). Fix by passing the scheduleFlush
+ flag along.
+
+ Not testable with current GraphicsLayer configurations.
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ * platform/graphics/ca/GraphicsLayerCA.h:
+
</ins><span class="cx"> 2014-11-08 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement action menu support for videos
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (175780 => 175781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-11-08 20:27:13 UTC (rev 175780)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-11-08 23:50:43 UTC (rev 175781)
</span><span class="lines">@@ -3181,7 +3181,7 @@
</span><span class="cx"> replicaPosition.y() + m_anchorPoint.y() * m_size.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::propagateLayerChangeToReplicas()
</del><ins>+void GraphicsLayerCA::propagateLayerChangeToReplicas(ScheduleFlushOrNot scheduleFlush)
</ins><span class="cx"> {
</span><span class="cx"> for (GraphicsLayer* currentLayer = this; currentLayer; currentLayer = currentLayer->parent()) {
</span><span class="cx"> GraphicsLayerCA& currentLayerCA = downcast<GraphicsLayerCA>(*currentLayer);
</span><span class="lines">@@ -3189,7 +3189,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (currentLayerCA.replicaLayer())
</span><del>- downcast<GraphicsLayerCA>(*currentLayerCA.replicaLayer()).noteLayerPropertyChanged(ReplicatedLayerChanged);
</del><ins>+ downcast<GraphicsLayerCA>(*currentLayerCA.replicaLayer()).noteLayerPropertyChanged(ReplicatedLayerChanged, scheduleFlush);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3390,7 +3390,7 @@
</span><span class="cx"> void GraphicsLayerCA::noteSublayersChanged(ScheduleFlushOrNot scheduleFlush)
</span><span class="cx"> {
</span><span class="cx"> noteLayerPropertyChanged(ChildrenChanged, scheduleFlush);
</span><del>- propagateLayerChangeToReplicas();
</del><ins>+ propagateLayerChangeToReplicas(scheduleFlush);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool GraphicsLayerCA::canThrottleLayerFlush() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (175780 => 175781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-11-08 20:27:13 UTC (rev 175780)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-11-08 23:50:43 UTC (rev 175781)
</span><span class="lines">@@ -350,8 +350,6 @@
</span><span class="cx"> void removeCloneLayers();
</span><span class="cx"> FloatPoint positionForCloneRootLayer() const;
</span><span class="cx">
</span><del>- void propagateLayerChangeToReplicas();
-
</del><span class="cx"> // All these "update" methods will be called inside a BEGIN_BLOCK_OBJC_EXCEPTIONS/END_BLOCK_OBJC_EXCEPTIONS block.
</span><span class="cx"> void updateLayerNames();
</span><span class="cx"> void updateSublayerList(bool maxLayerDepthReached = false);
</span><span class="lines">@@ -445,6 +443,8 @@
</span><span class="cx"> void noteSublayersChanged(ScheduleFlushOrNot = ScheduleFlush);
</span><span class="cx"> void noteChangesForScaleSensitiveProperties();
</span><span class="cx">
</span><ins>+ void propagateLayerChangeToReplicas(ScheduleFlushOrNot = ScheduleFlush);
+
</ins><span class="cx"> void repaintLayerDirtyRects();
</span><span class="cx">
</span><span class="cx"> RefPtr<PlatformCALayer> m_layer; // The main layer
</span></span></pre>
</div>
</div>
</body>
</html>