<!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>[184274] 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/184274">184274</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-05-12 23:47:21 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce TransformationMatrix copies in MatrixTransformOperation, Matrix3DTransformOperation
https://bugs.webkit.org/show_bug.cgi?id=144797
Reviewed by Darin Adler.
Using std::swap() on TransformationMatrix objects which don't
provide move constructors will result in copies.
Instead, use a helper function in both MatrixTransformOperation
and Matrix3DTransformOperation that calls TransformationMatrix::blend()
and returns the new Matrix(3D)TransformOperation object, and call it
with fromT and toT arguments switched when blending to identity.
* platform/graphics/transforms/Matrix3DTransformOperation.cpp:
(WebCore::createOperation):
(WebCore::Matrix3DTransformOperation::blend):
* platform/graphics/transforms/Matrix3DTransformOperation.h: No need
to copy the m_matrix member, it won't change when passed to
TransformationMatrix::multiply().
* platform/graphics/transforms/MatrixTransformOperation.cpp:
(WebCore::createOperation):
(WebCore::MatrixTransformOperation::blend):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184273 => 184274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-05-13 06:18:22 UTC (rev 184273)
+++ trunk/Source/WebCore/ChangeLog        2015-05-13 06:47:21 UTC (rev 184274)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-05-12 Zan Dobersek <zdobersek@igalia.com>
+
+ Reduce TransformationMatrix copies in MatrixTransformOperation, Matrix3DTransformOperation
+ https://bugs.webkit.org/show_bug.cgi?id=144797
+
+ Reviewed by Darin Adler.
+
+ Using std::swap() on TransformationMatrix objects which don't
+ provide move constructors will result in copies.
+
+ Instead, use a helper function in both MatrixTransformOperation
+ and Matrix3DTransformOperation that calls TransformationMatrix::blend()
+ and returns the new Matrix(3D)TransformOperation object, and call it
+ with fromT and toT arguments switched when blending to identity.
+
+ * platform/graphics/transforms/Matrix3DTransformOperation.cpp:
+ (WebCore::createOperation):
+ (WebCore::Matrix3DTransformOperation::blend):
+ * platform/graphics/transforms/Matrix3DTransformOperation.h: No need
+ to copy the m_matrix member, it won't change when passed to
+ TransformationMatrix::multiply().
+ * platform/graphics/transforms/MatrixTransformOperation.cpp:
+ (WebCore::createOperation):
+ (WebCore::MatrixTransformOperation::blend):
+
</ins><span class="cx"> 2015-05-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EGL][X11] XPixmap created in GLContextEGL::createPixmapContext() is leaked
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp (184273 => 184274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp        2015-05-13 06:18:22 UTC (rev 184273)
+++ trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp        2015-05-13 06:47:21 UTC (rev 184274)
</span><span class="lines">@@ -35,6 +35,12 @@
</span><span class="cx"> return isSameType(other) && m_matrix == downcast<Matrix3DTransformOperation>(other).m_matrix;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Ref<TransformOperation> createOperation(TransformationMatrix& to, TransformationMatrix& from, double progress)
+{
+ to.blend(from, progress);
+ return Matrix3DTransformOperation::create(to);
+}
+
</ins><span class="cx"> Ref<TransformOperation> Matrix3DTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -50,10 +56,8 @@
</span><span class="cx"> apply(toT, size);
</span><span class="cx">
</span><span class="cx"> if (blendToIdentity)
</span><del>- std::swap(fromT, toT);
-
- toT.blend(fromT, progress);
- return Matrix3DTransformOperation::create(toT);
</del><ins>+ return createOperation(fromT, toT, progress);
+ return createOperation(toT, fromT, progress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h (184273 => 184274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h        2015-05-13 06:18:22 UTC (rev 184273)
+++ trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h        2015-05-13 06:47:21 UTC (rev 184274)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool apply(TransformationMatrix& transform, const FloatSize&) const override
</span><span class="cx"> {
</span><del>- transform.multiply(TransformationMatrix(m_matrix));
</del><ins>+ transform.multiply(m_matrix);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp (184273 => 184274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp        2015-05-13 06:18:22 UTC (rev 184273)
+++ trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp        2015-05-13 06:47:21 UTC (rev 184274)
</span><span class="lines">@@ -34,6 +34,12 @@
</span><span class="cx"> return m_a == m.m_a && m_b == m.m_b && m_c == m.m_c && m_d == m.m_d && m_e == m.m_e && m_f == m.m_f;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Ref<TransformOperation> createOperation(TransformationMatrix& to, TransformationMatrix& from, double progress)
+{
+ to.blend(from, progress);
+ return MatrixTransformOperation::create(to);
+}
+
</ins><span class="cx"> Ref<TransformOperation> MatrixTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -46,12 +52,10 @@
</span><span class="cx"> const MatrixTransformOperation& m = downcast<MatrixTransformOperation>(*from);
</span><span class="cx"> fromT.setMatrix(m.m_a, m.m_b, m.m_c, m.m_d, m.m_e, m.m_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (blendToIdentity)
</span><del>- std::swap(fromT, toT);
-
- toT.blend(fromT, progress);
- return MatrixTransformOperation::create(toT.a(), toT.b(), toT.c(), toT.d(), toT.e(), toT.f());
</del><ins>+ return createOperation(fromT, toT, progress);
+ return createOperation(toT, fromT, progress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>