Changeset 167017 in webkit

Timestamp:

Apr 9, 2014 10:05:18 AM (10 years ago)

Author:

andersca@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/transforms/AffineTransform.cpp (modified) (2 diffs)
• platform/graphics/transforms/AffineTransform.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2014-04-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp

@@ -39 +39 @@
 
 AffineTransform::AffineTransform()
-{
-    setMatrix(1, 0, 0, 1, 0, 0);
+    : m_transform { { 1, 0, 0, 1, 0, 0 } }
+{
 }
 
 AffineTransform::AffineTransform(double a, double b, double c, double d, double e, double f)
-{
-    setMatrix(a, b, c, d, e, f);
+    : m_transform { { a, b, c, d, e, f } }
+{
 }
 
@@ -131 +131 @@
     trans.m_transform[5] = other.m_transform[4] * m_transform[1] + other.m_transform[5] * m_transform[3] + m_transform[5];
 
-    setMatrix(trans.m_transform);
+    *this = trans;
     return *this;
 }

trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h

@@ -28 +28 @@
 #define AffineTransform_h
 
-#include <string.h> // for memcpy
+#include <array>
 #include <wtf/FastMalloc.h>
 
@@ -51 +51 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    typedef double Transform[6];
-
     AffineTransform();
     AffineTransform(double a, double b, double c, double d, double e, double f);
@@ -188 +186 @@
 
 private:
-    void setMatrix(const Transform m)
-    {
-        if (m && m != m_transform)
-            memcpy(m_transform, m, sizeof(Transform));
-    }
-
-    Transform m_transform;
+    std::array<double, 6> m_transform;
 };