Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: Source/core/dom/DOMMatrix.cpp

Issue 460713002: DOMMatrix should use TransformationMatrix internally. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/DOMMatrix.h ('k') | Source/core/dom/DOMMatrixReadOnly.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DOMMatrix.cpp
diff --git a/Source/core/dom/DOMMatrix.cpp b/Source/core/dom/DOMMatrix.cpp
index 59b27ccf9fcece18644f4a4e4be5a3b4d25115a4..4ff0491e1e74096c480b2e29c14e88638437de3e 100644
--- a/Source/core/dom/DOMMatrix.cpp
+++ b/Source/core/dom/DOMMatrix.cpp
@@ -9,40 +9,17 @@ namespace blink {
DOMMatrix* DOMMatrix::create()
{
- return new DOMMatrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+ return new DOMMatrix(TransformationMatrix());
}
DOMMatrix* DOMMatrix::create(DOMMatrixReadOnly* other)
{
- return new DOMMatrix(other->m11(), other->m12(), other->m13(), other->m14(),
- other->m21(), other->m22(), other->m23(), other->m24(),
- other->m31(), other->m32(), other->m33(), other->m34(),
- other->m41(), other->m42(), other->m43(), other->m44(),
- other->is2D());
+ return new DOMMatrix(other->matrix(), other->is2D());
}
-DOMMatrix::DOMMatrix(double m11, double m12, double m13, double m14,
- double m21, double m22, double m23, double m24,
- double m31, double m32, double m33, double m34,
- double m41, double m42, double m43, double m44,
- bool is2D)
+DOMMatrix::DOMMatrix(const TransformationMatrix& matrix, bool is2D)
{
- m_matrix[0][0] = m11;
- m_matrix[0][1] = m12;
- m_matrix[0][2] = m13;
- m_matrix[0][3] = m14;
- m_matrix[1][0] = m21;
- m_matrix[1][1] = m22;
- m_matrix[1][2] = m23;
- m_matrix[1][3] = m24;
- m_matrix[2][0] = m31;
- m_matrix[2][1] = m32;
- m_matrix[2][2] = m33;
- m_matrix[2][3] = m34;
- m_matrix[3][0] = m41;
- m_matrix[3][1] = m42;
- m_matrix[3][2] = m43;
- m_matrix[3][3] = m44;
+ m_matrix = matrix;
m_is2D = is2D;
}
« no previous file with comments | « Source/core/dom/DOMMatrix.h ('k') | Source/core/dom/DOMMatrixReadOnly.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698