<!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>[167017] 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/167017">167017</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 10:05:18 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::array in AffineTransform, and get rid of setMatrix
https://bugs.webkit.org/show_bug.cgi?id=131416
Reviewed by Sam Weinig.
* platform/graphics/transforms/AffineTransform.cpp:
(WebCore::AffineTransform::AffineTransform):
(WebCore::AffineTransform::multiply):
* platform/graphics/transforms/AffineTransform.h:
(WebCore::AffineTransform::setMatrix): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformcpp">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformh">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167016 => 167017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-09 16:53:26 UTC (rev 167016)
+++ trunk/Source/WebCore/ChangeLog 2014-04-09 17:05:18 UTC (rev 167017)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-09 Anders Carlsson <andersca@apple.com>
+
+ Use std::array in AffineTransform, and get rid of setMatrix
+ https://bugs.webkit.org/show_bug.cgi?id=131416
+
+ Reviewed by Sam Weinig.
+
+ * platform/graphics/transforms/AffineTransform.cpp:
+ (WebCore::AffineTransform::AffineTransform):
+ (WebCore::AffineTransform::multiply):
+ * platform/graphics/transforms/AffineTransform.h:
+ (WebCore::AffineTransform::setMatrix): Deleted.
+
</ins><span class="cx"> 2014-04-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Plugin process crashes when loading totem plugin
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp (167016 => 167017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2014-04-09 16:53:26 UTC (rev 167016)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2014-04-09 17:05:18 UTC (rev 167017)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> AffineTransform::AffineTransform()
</span><ins>+ : m_transform { { 1, 0, 0, 1, 0, 0 } }
</ins><span class="cx"> {
</span><del>- setMatrix(1, 0, 0, 1, 0, 0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AffineTransform::AffineTransform(double a, double b, double c, double d, double e, double f)
</span><ins>+ : m_transform { { a, b, c, d, e, f } }
</ins><span class="cx"> {
</span><del>- setMatrix(a, b, c, d, e, f);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AffineTransform::makeIdentity()
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> trans.m_transform[4] = other.m_transform[4] * m_transform[0] + other.m_transform[5] * m_transform[2] + m_transform[4];
</span><span class="cx"> trans.m_transform[5] = other.m_transform[4] * m_transform[1] + other.m_transform[5] * m_transform[3] + m_transform[5];
</span><span class="cx">
</span><del>- setMatrix(trans.m_transform);
</del><ins>+ *this = trans;
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (167016 => 167017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2014-04-09 16:53:26 UTC (rev 167016)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2014-04-09 17:05:18 UTC (rev 167017)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef AffineTransform_h
</span><span class="cx"> #define AffineTransform_h
</span><span class="cx">
</span><del>-#include <string.h> // for memcpy
</del><ins>+#include <array>
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -50,8 +50,6 @@
</span><span class="cx"> class AffineTransform {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- typedef double Transform[6];
-
</del><span class="cx"> AffineTransform();
</span><span class="cx"> AffineTransform(double a, double b, double c, double d, double e, double f);
</span><span class="cx">
</span><span class="lines">@@ -187,13 +185,7 @@
</span><span class="cx"> void recompose(const DecomposedType&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void setMatrix(const Transform m)
- {
- if (m && m != m_transform)
- memcpy(m_transform, m, sizeof(Transform));
- }
-
- Transform m_transform;
</del><ins>+ std::array<double, 6> m_transform;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> AffineTransform makeMapBetweenRects(const FloatRect& source, const FloatRect& dest);
</span></span></pre>
</div>
</div>
</body>
</html>