<!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>[178034] 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/178034">178034</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-01-07 05:14:25 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] Avoid constructing Vector when setting new children of TextureMapperLayer
https://bugs.webkit.org/show_bug.cgi?id=137265
Reviewed by Brent Fulgham.
Instead of constructing a vector object and populating it with TextureMapperLayers
every time the children of a GraphicsLayer change, the children vector is now passed
directly to TextureMapperLayer::setChildren(), which properly downcasts GraphicsLayers
and adds the new TextureMapperLayer children.
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
(WebCore::toTextureMapperLayerVector): Deleted.
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::setChildren):
* platform/graphics/texmap/TextureMapperLayer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178033 => 178034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 12:49:15 UTC (rev 178033)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 13:14:25 UTC (rev 178034)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-06 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Avoid constructing Vector when setting new children of TextureMapperLayer
+ https://bugs.webkit.org/show_bug.cgi?id=137265
+
+ Reviewed by Brent Fulgham.
+
+ Instead of constructing a vector object and populating it with TextureMapperLayers
+ every time the children of a GraphicsLayer change, the children vector is now passed
+ directly to TextureMapperLayer::setChildren(), which properly downcasts GraphicsLayers
+ and adds the new TextureMapperLayer children.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
+ (WebCore::toTextureMapperLayerVector): Deleted.
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::setChildren):
+ * platform/graphics/texmap/TextureMapperLayer.h:
+
</ins><span class="cx"> 2015-01-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TexMap] m_layer member in GraphicsLayerTextureMapper is always non-null
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (178033 => 178034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-01-07 12:49:15 UTC (rev 178033)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-01-07 13:14:25 UTC (rev 178034)
</span><span class="lines">@@ -408,23 +408,13 @@
</span><span class="cx"> m_changeMask |= DebugVisualsChange;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void toTextureMapperLayerVector(const Vector<GraphicsLayer*>& layers, Vector<TextureMapperLayer*>& texmapLayers)
-{
- texmapLayers.reserveCapacity(layers.size());
- for (auto* layer : layers)
- texmapLayers.append(&downcast<GraphicsLayerTextureMapper>(layer)->layer());
-}
-
</del><span class="cx"> void GraphicsLayerTextureMapper::commitLayerChanges()
</span><span class="cx"> {
</span><span class="cx"> if (m_changeMask == NoChanges)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_changeMask & ChildrenChange) {
- Vector<TextureMapperLayer*> textureMapperLayerChildren;
- toTextureMapperLayerVector(children(), textureMapperLayerChildren);
- m_layer.setChildren(textureMapperLayerChildren);
- }
</del><ins>+ if (m_changeMask & ChildrenChange)
+ m_layer.setChildren(children());
</ins><span class="cx">
</span><span class="cx"> if (m_changeMask & MaskLayerChange)
</span><span class="cx"> m_layer.setMaskLayer(&downcast<GraphicsLayerTextureMapper>(maskLayer())->layer());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (178033 => 178034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2015-01-07 12:49:15 UTC (rev 178033)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2015-01-07 13:14:25 UTC (rev 178034)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "TextureMapperLayer.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatQuad.h"
</span><ins>+#include "GraphicsLayerTextureMapper.h"
</ins><span class="cx"> #include "Region.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -448,11 +449,11 @@
</span><span class="cx"> removeFromParent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextureMapperLayer::setChildren(const Vector<TextureMapperLayer*>& newChildren)
</del><ins>+void TextureMapperLayer::setChildren(const Vector<GraphicsLayer*>& newChildren)
</ins><span class="cx"> {
</span><span class="cx"> removeAllChildren();
</span><span class="cx"> for (auto* child : newChildren)
</span><del>- addChild(child);
</del><ins>+ addChild(&downcast<GraphicsLayerTextureMapper>(child)->layer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::addChild(TextureMapperLayer* childLayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (178033 => 178034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2015-01-07 12:49:15 UTC (rev 178033)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2015-01-07 13:14:25 UTC (rev 178034)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class GraphicsLayer;
</ins><span class="cx"> class Region;
</span><span class="cx"> class TextureMapperPaintOptions;
</span><span class="cx"> class TextureMapperPlatformLayer;
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx"> TextureMapper* textureMapper() const { return rootLayer().m_textureMapper; }
</span><span class="cx"> void setTextureMapper(TextureMapper* texmap) { m_textureMapper = texmap; }
</span><span class="cx">
</span><del>- void setChildren(const Vector<TextureMapperLayer*>&);
</del><ins>+ void setChildren(const Vector<GraphicsLayer*>&);
</ins><span class="cx"> void setMaskLayer(TextureMapperLayer*);
</span><span class="cx"> void setReplicaLayer(TextureMapperLayer*);
</span><span class="cx"> void setPosition(const FloatPoint&);
</span></span></pre>
</div>
</div>
</body>
</html>