<!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>[56200] 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/56200">56200</a></dd>
<dt>Author</dt> <dd>cmarrin@apple.com</dd>
<dt>Date</dt> <dd>2010-03-18 16:00:53 -0700 (Thu, 18 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Fixed parenting issues with HW layers on Windows
        https://bugs.webkit.org/show_bug.cgi?id=32449</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicswinGraphicsLayerCACFcpp">trunk/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicswinWKCACFLayercpp">trunk/WebCore/platform/graphics/win/WKCACFLayer.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicswinWKCACFLayerh">trunk/WebCore/platform/graphics/win/WKCACFLayer.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56199 => 56200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-18 22:45:20 UTC (rev 56199)
+++ trunk/WebCore/ChangeLog        2010-03-18 23:00:53 UTC (rev 56200)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2010-03-18  Chris Marrin  &lt;cmarrin@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        Fixed parenting issues with HW layers on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=32449
+        
+        CACF can't properly fix superlayer changes, so a layer added
+        as a sublayer must have a null superlayer. I changed a couple of
+        places that change sublayers to removeFromSuperlayer while adding
+        to a new layer. This fixes both the problem of disappearing children
+        and children getting doubled. Also got rid of removeSublayer(). Layers
+        should always be removed from their parent with removeFromSuperlayer().
+        
+        This also removed moveLayer(), which is not used and may not be safe in how
+        it copies.
+
+        * platform/graphics/win/GraphicsLayerCACF.cpp:Changed setName to be like Mac, to give more debugging info (to fix problems like these)
+        (WebCore::GraphicsLayerCACF::setName):
+        * platform/graphics/win/WKCACFLayer.cpp:Make sure superlayer is null before adding
+        (WebCore::WKCACFLayer::insertSublayer):
+        (WebCore::WKCACFLayer::replaceSublayer):
+        (WebCore::WKCACFLayer::removeFromSuperlayer):
+        (WebCore::WKCACFLayer::setSublayers):
+        (WebCore::WKCACFLayer::printLayer):print the superlayer for better debugging
+        * platform/graphics/win/WKCACFLayer.h:
+
</ins><span class="cx"> 2010-03-18  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, build fix.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswinGraphicsLayerCACFcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp (56199 => 56200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp        2010-03-18 22:45:20 UTC (rev 56199)
+++ trunk/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp        2010-03-18 23:00:53 UTC (rev 56200)
</span><span class="lines">@@ -254,12 +254,12 @@
</span><span class="cx">         m_transformLayer-&gt;removeFromSuperlayer();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GraphicsLayerCACF::setName(const String&amp; inName)
</del><ins>+void GraphicsLayerCACF::setName(const String&amp; name)
</ins><span class="cx"> {
</span><del>-    String name = String::format(&quot;CALayer(%p) GraphicsLayer(%p) &quot;, m_layer.get(), this) + inName;
-    GraphicsLayer::setName(name);
</del><ins>+    String longName = String::format(&quot;CALayer(%p) GraphicsLayer(%p) &quot;, m_layer.get(), this) + name;
+    GraphicsLayer::setName(longName);
</ins><span class="cx">     
</span><del>-    m_layer-&gt;setName(inName);
</del><ins>+    m_layer-&gt;setName(longName);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> NativeLayer GraphicsLayerCACF::nativeLayer() const
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswinWKCACFLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/win/WKCACFLayer.cpp (56199 => 56200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/win/WKCACFLayer.cpp        2010-03-18 22:45:20 UTC (rev 56199)
+++ trunk/WebCore/platform/graphics/win/WKCACFLayer.cpp        2010-03-18 23:00:53 UTC (rev 56200)
</span><span class="lines">@@ -241,6 +241,7 @@
</span><span class="cx"> void WKCACFLayer::insertSublayer(PassRefPtr&lt;WKCACFLayer&gt; sublayer, size_t index)
</span><span class="cx"> {
</span><span class="cx">     index = min(index, numSublayers());
</span><ins>+    sublayer-&gt;removeFromSuperlayer();
</ins><span class="cx">     CACFLayerInsertSublayer(layer(), sublayer-&gt;layer(), index);
</span><span class="cx">     setNeedsCommit();
</span><span class="cx"> }
</span><span class="lines">@@ -285,21 +286,17 @@
</span><span class="cx">     if (reference == newLayer)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (!newLayer) {
-        removeSublayer(reference);
-        return;
-    }
-
-    newLayer-&gt;removeFromSuperlayer();
-
</del><span class="cx">     int referenceIndex = indexOfSublayer(reference);
</span><span class="cx">     ASSERT(referenceIndex != -1);
</span><span class="cx">     if (referenceIndex == -1)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    // FIXME: Can we make this more efficient? The current CACF API doesn't seem to give us a way to do so.
</del><span class="cx">     reference-&gt;removeFromSuperlayer();
</span><del>-    insertSublayer(newLayer, referenceIndex);
</del><ins>+
+    if (newLayer) {
+        newLayer-&gt;removeFromSuperlayer();
+        insertSublayer(newLayer, referenceIndex);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WKCACFLayer::removeFromSuperlayer()
</span><span class="lines">@@ -308,21 +305,10 @@
</span><span class="cx">     if (!superlayer)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    superlayer-&gt;removeSublayer(this);
</del><span class="cx">     CACFLayerRemoveFromSuperlayer(layer());
</span><span class="cx">     superlayer-&gt;setNeedsCommit();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WKCACFLayer::removeSublayer(const WKCACFLayer* sublayer)
-{
-    int foundIndex = indexOfSublayer(sublayer);
-    if (foundIndex == -1)
-        return;
-
-    CACFLayerRemoveFromSuperlayer(sublayer-&gt;layer());
-    setNeedsCommit();
-}
-
</del><span class="cx"> const WKCACFLayer* WKCACFLayer::sublayerAtIndex(int index) const
</span><span class="cx"> {
</span><span class="cx">     CFArrayRef sublayers = CACFLayerGetSublayers(layer());
</span><span class="lines">@@ -431,29 +417,18 @@
</span><span class="cx"> 
</span><span class="cx"> void WKCACFLayer::setSublayers(const Vector&lt;RefPtr&lt;WKCACFLayer&gt; &gt;&amp; sublayers)
</span><span class="cx"> {
</span><del>-    if (sublayers.isEmpty())
-        CACFLayerSetSublayers(layer(), 0);
-    else {
-        // Create a vector of CACFLayers.
-        Vector&lt;const void*&gt; layers;
-        for (size_t i = 0; i &lt; sublayers.size(); i++)
-            layers.append(sublayers[i]-&gt;layer());
-    
-        RetainPtr&lt;CFArrayRef&gt; layersArray(AdoptCF, CFArrayCreate(0, layers.data(), layers.size(), 0));
-        CACFLayerSetSublayers(layer(), layersArray.get());
-    }
-    
-    setNeedsCommit();
-}
</del><ins>+    // Remove all the current sublayers and add the passed layers
+    CACFLayerSetSublayers(layer(), 0);
</ins><span class="cx"> 
</span><del>-void WKCACFLayer::moveSublayers(WKCACFLayer* fromLayer, WKCACFLayer* toLayer)
-{
-    if (!fromLayer || !toLayer)
-        return;
</del><ins>+    // Perform removeFromSuperLayer in a separate pass. CACF requires superlayer to
+    // be null or CACFLayerInsertSublayer silently fails.
+    for (size_t i = 0; i &lt; sublayers.size(); i++)
+        CACFLayerRemoveFromSuperlayer(sublayers[i]-&gt;layer());
</ins><span class="cx"> 
</span><del>-    CACFLayerSetSublayers(toLayer-&gt;layer(), CACFLayerGetSublayers(fromLayer-&gt;layer()));
-    fromLayer-&gt;setNeedsCommit();
-    toLayer-&gt;setNeedsCommit();
</del><ins>+    for (size_t i = 0; i &lt; sublayers.size(); i++)
+        CACFLayerInsertSublayer(layer(), sublayers[i]-&gt;layer(), i);
+
+    setNeedsCommit();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WKCACFLayer* WKCACFLayer::superlayer() const
</span><span class="lines">@@ -508,11 +483,11 @@
</span><span class="cx">     CGPoint layerAnchorPoint = anchorPoint();
</span><span class="cx">     CGRect layerBounds = bounds();
</span><span class="cx">     printIndent(indent);
</span><del>-    fprintf(stderr, &quot;(%s [%g %g %g] [%g %g %g %g] [%g %g %g]\n&quot;,
</del><ins>+    fprintf(stderr, &quot;(%s [%g %g %g] [%g %g %g %g] [%g %g %g] superlayer=%p\n&quot;,
</ins><span class="cx">         isTransformLayer() ? &quot;transform-layer&quot; : &quot;layer&quot;,
</span><span class="cx">         layerPosition.x, layerPosition.y, zPosition(), 
</span><span class="cx">         layerBounds.origin.x, layerBounds.origin.y, layerBounds.size.width, layerBounds.size.height,
</span><del>-        layerAnchorPoint.x, layerAnchorPoint.y, anchorPointZ());
</del><ins>+        layerAnchorPoint.x, layerAnchorPoint.y, anchorPointZ(), superlayer());
</ins><span class="cx"> 
</span><span class="cx">     // Print name if needed
</span><span class="cx">     String layerName = name();
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicswinWKCACFLayerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/win/WKCACFLayer.h (56199 => 56200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/win/WKCACFLayer.h        2010-03-18 22:45:20 UTC (rev 56199)
+++ trunk/WebCore/platform/graphics/win/WKCACFLayer.h        2010-03-18 23:00:53 UTC (rev 56200)
</span><span class="lines">@@ -118,7 +118,6 @@
</span><span class="cx">     void insertSublayerBelowLayer(PassRefPtr&lt;WKCACFLayer&gt;, const WKCACFLayer* reference);
</span><span class="cx">     void replaceSublayer(WKCACFLayer* reference, PassRefPtr&lt;WKCACFLayer&gt;);
</span><span class="cx">     void removeFromSuperlayer();
</span><del>-    static void moveSublayers(WKCACFLayer* fromLayer, WKCACFLayer* toLayer);
</del><span class="cx"> 
</span><span class="cx">     WKCACFLayer* ancestorOrSelfWithSuperlayer(WKCACFLayer*) const;
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>