<!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>[184187] releases/WebKitGTK/webkit-2.8/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/184187">184187</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-12 02:17:53 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184070">r184070</a> - Reduce TransformationMatrix copies in WebKitCSSMatrix operations
https://bugs.webkit.org/show_bug.cgi?id=144795
Reviewed by Darin Adler.
Instead of copying the TransformationMatrix member, performing
the operation on it and then copying it again when creating
the new WebKitCSSMatrix object, copy it just once by first
creating the new WebKitCSSMatrix object and then performing
the operation on that object's TransformationMatrix directly.
* css/WebKitCSSMatrix.cpp:
(WebCore::WebKitCSSMatrix::multiply):
(WebCore::WebKitCSSMatrix::translate):
(WebCore::WebKitCSSMatrix::scale):
(WebCore::WebKitCSSMatrix::rotate):
(WebCore::WebKitCSSMatrix::rotateAxisAngle):
(WebCore::WebKitCSSMatrix::skewX):
(WebCore::WebKitCSSMatrix::skewY):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorecssWebKitCSSMatrixcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/css/WebKitCSSMatrix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184186 => 184187)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 09:17:02 UTC (rev 184186)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 09:17:53 UTC (rev 184187)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-11 Zan Dobersek <zdobersek@igalia.com>
+
+ Reduce TransformationMatrix copies in WebKitCSSMatrix operations
+ https://bugs.webkit.org/show_bug.cgi?id=144795
+
+ Reviewed by Darin Adler.
+
+ Instead of copying the TransformationMatrix member, performing
+ the operation on it and then copying it again when creating
+ the new WebKitCSSMatrix object, copy it just once by first
+ creating the new WebKitCSSMatrix object and then performing
+ the operation on that object's TransformationMatrix directly.
+
+ * css/WebKitCSSMatrix.cpp:
+ (WebCore::WebKitCSSMatrix::multiply):
+ (WebCore::WebKitCSSMatrix::translate):
+ (WebCore::WebKitCSSMatrix::scale):
+ (WebCore::WebKitCSSMatrix::rotate):
+ (WebCore::WebKitCSSMatrix::rotateAxisAngle):
+ (WebCore::WebKitCSSMatrix::skewX):
+ (WebCore::WebKitCSSMatrix::skewY):
+
</ins><span class="cx"> 2015-05-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Crashes in SocketStreamHandleBase::close
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorecssWebKitCSSMatrixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/css/WebKitCSSMatrix.cpp (184186 => 184187)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/css/WebKitCSSMatrix.cpp 2015-05-12 09:17:02 UTC (rev 184186)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/css/WebKitCSSMatrix.cpp 2015-05-12 09:17:53 UTC (rev 184187)
</span><span class="lines">@@ -92,9 +92,11 @@
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::multiply(WebKitCSSMatrix* secondMatrix) const
</span><span class="cx"> {
</span><span class="cx"> if (!secondMatrix)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).multiply(secondMatrix->m_matrix));
</del><ins>+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.multiply(secondMatrix->m_matrix);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::inverse(ExceptionCode& ec) const
</span><span class="lines">@@ -115,7 +117,10 @@
</span><span class="cx"> y = 0;
</span><span class="cx"> if (std::isnan(z))
</span><span class="cx"> z = 0;
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).translate3d(x, y, z));
</del><ins>+
+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.translate3d(x, y, z);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::scale(double scaleX, double scaleY, double scaleZ) const
</span><span class="lines">@@ -126,7 +131,10 @@
</span><span class="cx"> scaleY = scaleX;
</span><span class="cx"> if (std::isnan(scaleZ))
</span><span class="cx"> scaleZ = 1;
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).scale3d(scaleX, scaleY, scaleZ));
</del><ins>+
+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.scale3d(scaleX, scaleY, scaleZ);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::rotate(double rotX, double rotY, double rotZ) const
</span><span class="lines">@@ -144,7 +152,10 @@
</span><span class="cx"> rotY = 0;
</span><span class="cx"> if (std::isnan(rotZ))
</span><span class="cx"> rotZ = 0;
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).rotate3d(rotX, rotY, rotZ));
</del><ins>+
+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.rotate3d(rotX, rotY, rotZ);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::rotateAxisAngle(double x, double y, double z, double angle) const
</span><span class="lines">@@ -159,21 +170,30 @@
</span><span class="cx"> angle = 0;
</span><span class="cx"> if (x == 0 && y == 0 && z == 0)
</span><span class="cx"> z = 1;
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).rotate3d(x, y, z, angle));
</del><ins>+
+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.rotate3d(x, y, z, angle);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::skewX(double angle) const
</span><span class="cx"> {
</span><span class="cx"> if (std::isnan(angle))
</span><span class="cx"> angle = 0;
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewX(angle));
</del><ins>+
+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.skewX(angle);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::skewY(double angle) const
</span><span class="cx"> {
</span><span class="cx"> if (std::isnan(angle))
</span><span class="cx"> angle = 0;
</span><del>- return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewY(angle));
</del><ins>+
+ RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+ matrix->m_matrix.skewY(angle);
+ return matrix.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebKitCSSMatrix::toString() const
</span></span></pre>
</div>
</div>
</body>
</html>