Changeset 184070 in webkit

Timestamp:

May 11, 2015, 1:52:35 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/WebKitCSSMatrix.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-05-11  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/css/WebKitCSSMatrix.cpp

@@ -93 +93 @@
 {
     if (!secondMatrix)
-        return 0;
-
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).multiply(secondMatrix->m_matrix));
+        return nullptr;
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.multiply(secondMatrix->m_matrix);
+    return matrix.release();
 }
 
@@ -116 +118 @@
     if (std::isnan(z))
         z = 0;
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).translate3d(x, y, z));
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.translate3d(x, y, z);
+    return matrix.release();
 }
 
@@ -127 +132 @@
     if (std::isnan(scaleZ))
         scaleZ = 1;
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).scale3d(scaleX, scaleY, scaleZ));
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.scale3d(scaleX, scaleY, scaleZ);
+    return matrix.release();
 }
 
@@ -145 +153 @@
     if (std::isnan(rotZ))
         rotZ = 0;
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).rotate3d(rotX, rotY, rotZ));
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.rotate3d(rotX, rotY, rotZ);
+    return matrix.release();
 }
 
@@ -160 +171 @@
     if (x == 0 && y == 0 && z == 0)
         z = 1;
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).rotate3d(x, y, z, angle));
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.rotate3d(x, y, z, angle);
+    return matrix.release();
 }
 
@@ -167 +181 @@
     if (std::isnan(angle))
         angle = 0;
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewX(angle));
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.skewX(angle);
+    return matrix.release();
 }
 
@@ -174 +191 @@
     if (std::isnan(angle))
         angle = 0;
-    return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewY(angle));
+
+    RefPtr<WebKitCSSMatrix> matrix = WebKitCSSMatrix::create(m_matrix);
+    matrix->m_matrix.skewY(angle);
+    return matrix.release();
 }