<!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>[179462] 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/179462">179462</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-02-01 02:17:49 -0800 (Sun, 01 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] Avoid unnecessary TransformationMatrix copies in GraphicsLayerTransform
https://bugs.webkit.org/show_bug.cgi?id=140735
Reviewed by Chris Dumez.
* platform/graphics/GraphicsLayerTransform.cpp:
(WebCore::GraphicsLayerTransform::combined): Return a const reference to the matrix.
(WebCore::GraphicsLayerTransform::combinedForChildren): Ditto.
(WebCore::GraphicsLayerTransform::combineTransforms): First copy the parent transform,
then apply the translation and multiplication. Previously this copied the parent
transform into a temporary object, performed the translation and multiplication, and
copied that temporary object again when assigning to the member variable.
(WebCore::GraphicsLayerTransform::combineTransformsForChildren): Mark const. m_childrenDirty
and m_combinedForChildren members are marked mutable.
* platform/graphics/GraphicsLayerTransform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerTransformcpp">trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerTransformh">trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179461 => 179462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-01 07:30:31 UTC (rev 179461)
+++ trunk/Source/WebCore/ChangeLog 2015-02-01 10:17:49 UTC (rev 179462)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-01 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Avoid unnecessary TransformationMatrix copies in GraphicsLayerTransform
+ https://bugs.webkit.org/show_bug.cgi?id=140735
+
+ Reviewed by Chris Dumez.
+
+ * platform/graphics/GraphicsLayerTransform.cpp:
+ (WebCore::GraphicsLayerTransform::combined): Return a const reference to the matrix.
+ (WebCore::GraphicsLayerTransform::combinedForChildren): Ditto.
+ (WebCore::GraphicsLayerTransform::combineTransforms): First copy the parent transform,
+ then apply the translation and multiplication. Previously this copied the parent
+ transform into a temporary object, performed the translation and multiplication, and
+ copied that temporary object again when assigning to the member variable.
+ (WebCore::GraphicsLayerTransform::combineTransformsForChildren): Mark const. m_childrenDirty
+ and m_combinedForChildren members are marked mutable.
+ * platform/graphics/GraphicsLayerTransform.h:
+
</ins><span class="cx"> 2015-01-31 Myles C. Maxfield <litherum@gmail.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r177689): Emoji variation sequences rendered incorrectly (as characters from other non-emoji font)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerTransformcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp (179461 => 179462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp 2015-02-01 07:30:31 UTC (rev 179461)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp 2015-02-01 10:17:49 UTC (rev 179462)
</span><span class="lines">@@ -78,13 +78,13 @@
</span><span class="cx"> m_dirty = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TransformationMatrix GraphicsLayerTransform::combined()
</del><ins>+const TransformationMatrix& GraphicsLayerTransform::combined() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_dirty);
</span><span class="cx"> return m_combined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TransformationMatrix GraphicsLayerTransform::combinedForChildren()
</del><ins>+const TransformationMatrix& GraphicsLayerTransform::combinedForChildren() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_dirty);
</span><span class="cx"> if (m_childrenDirty)
</span><span class="lines">@@ -96,10 +96,10 @@
</span><span class="cx"> {
</span><span class="cx"> float originX = m_anchorPoint.x() * m_size.width();
</span><span class="cx"> float originY = m_anchorPoint.y() * m_size.height();
</span><del>- m_combined =
- TransformationMatrix(parentTransform)
- .translate3d(originX + m_position.x(), originY + m_position.y(), m_anchorPoint.z() )
- .multiply(m_local);
</del><ins>+ m_combined = parentTransform;
+ m_combined
+ .translate3d(originX + m_position.x(), originY + m_position.y(), m_anchorPoint.z())
+ .multiply(m_local);
</ins><span class="cx">
</span><span class="cx"> // The children transform will take it from here, if it gets used.
</span><span class="cx"> m_combinedForChildren = m_combined;
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> m_childrenDirty = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerTransform::combineTransformsForChildren()
</del><ins>+void GraphicsLayerTransform::combineTransformsForChildren() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_dirty);
</span><span class="cx"> ASSERT(m_childrenDirty);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerTransformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.h (179461 => 179462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.h 2015-02-01 07:30:31 UTC (rev 179461)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.h 2015-02-01 10:17:49 UTC (rev 179462)
</span><span class="lines">@@ -36,25 +36,25 @@
</span><span class="cx"> void setFlattening(bool);
</span><span class="cx"> void setLocalTransform(const TransformationMatrix&);
</span><span class="cx"> void setChildrenTransform(const TransformationMatrix&);
</span><del>- TransformationMatrix combined();
- TransformationMatrix combinedForChildren();
</del><ins>+ const TransformationMatrix& combined() const;
+ const TransformationMatrix& combinedForChildren() const;
</ins><span class="cx">
</span><span class="cx"> void combineTransforms(const TransformationMatrix& parentTransform);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void combineTransformsForChildren();
</del><ins>+ void combineTransformsForChildren() const;
</ins><span class="cx">
</span><span class="cx"> FloatPoint3D m_anchorPoint;
</span><span class="cx"> FloatPoint m_position;
</span><span class="cx"> FloatSize m_size;
</span><span class="cx"> bool m_flattening;
</span><span class="cx"> bool m_dirty;
</span><del>- bool m_childrenDirty;
</del><ins>+ mutable bool m_childrenDirty;
</ins><span class="cx">
</span><span class="cx"> TransformationMatrix m_local;
</span><span class="cx"> TransformationMatrix m_children;
</span><span class="cx"> TransformationMatrix m_combined;
</span><del>- TransformationMatrix m_combinedForChildren;
</del><ins>+ mutable TransformationMatrix m_combinedForChildren;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>