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

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

Issue 2741723005: Move geometry interface files to geometry directory. (Closed)
Patch Set: Rebase Created 3 years, 9 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 | « third_party/WebKit/Source/core/dom/DOMMatrix.h ('k') | third_party/WebKit/Source/core/dom/DOMMatrix.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/DOMMatrix.cpp
diff --git a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp b/third_party/WebKit/Source/core/dom/DOMMatrix.cpp
deleted file mode 100644
index 59c6ae4412f04aa6c0f8c2c0e4fb043a1bee1217..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "core/dom/DOMMatrix.h"
-
-namespace blink {
-
-DOMMatrix* DOMMatrix::create(ExceptionState& exceptionState) {
- return new DOMMatrix(TransformationMatrix());
-}
-
-DOMMatrix* DOMMatrix::create(DOMMatrixReadOnly* other,
- ExceptionState& exceptionState) {
- return new DOMMatrix(other->matrix(), other->is2D());
-}
-
-DOMMatrix* DOMMatrix::create(const SkMatrix44& matrix,
- ExceptionState& exceptionState) {
- TransformationMatrix transformationMatrix(matrix);
- return new DOMMatrix(transformationMatrix, transformationMatrix.isAffine());
-}
-
-DOMMatrix* DOMMatrix::create(const String& transformList,
- ExceptionState& exceptionState) {
- DOMMatrix* matrix = new DOMMatrix(TransformationMatrix());
- matrix->setMatrixValueFromString(transformList, exceptionState);
- return matrix;
-}
-
-DOMMatrix* DOMMatrix::create(Vector<double> sequence,
- ExceptionState& exceptionState) {
- if (sequence.size() != 6 && sequence.size() != 16) {
- exceptionState.throwTypeError(
- "The sequence must contain 6 elements for a 2D matrix or 16 elements "
- "for a 3D matrix.");
- return nullptr;
- }
- return new DOMMatrix(sequence, sequence.size());
-}
-
-DOMMatrix* DOMMatrix::fromFloat32Array(DOMFloat32Array* float32Array,
- ExceptionState& exceptionState) {
- if (float32Array->length() != 6 && float32Array->length() != 16) {
- exceptionState.throwTypeError(
- "The sequence must contain 6 elements for a 2D matrix or 16 elements "
- "for a 3D matrix.");
- return nullptr;
- }
- return new DOMMatrix(float32Array->data(), float32Array->length());
-}
-
-DOMMatrix* DOMMatrix::fromFloat64Array(DOMFloat64Array* float64Array,
- ExceptionState& exceptionState) {
- if (float64Array->length() != 6 && float64Array->length() != 16) {
- exceptionState.throwTypeError(
- "The sequence must contain 6 elements for a 2D matrix or 16 elements "
- "for a 3D matrix.");
- return nullptr;
- }
- return new DOMMatrix(float64Array->data(), float64Array->length());
-}
-
-template <typename T>
-DOMMatrix::DOMMatrix(T sequence, int size)
- : DOMMatrixReadOnly(sequence, size) {}
-
-DOMMatrix::DOMMatrix(const TransformationMatrix& matrix, bool is2D)
- : DOMMatrixReadOnly(matrix, is2D) {}
-
-DOMMatrix* DOMMatrix::fromMatrix(DOMMatrixInit& other,
- ExceptionState& exceptionState) {
- if (!validateAndFixup(other, exceptionState)) {
- DCHECK(exceptionState.hadException());
- return nullptr;
- }
- if (other.is2D()) {
- return new DOMMatrix({other.m11(), other.m12(), other.m21(), other.m22(),
- other.m41(), other.m42()},
- other.is2D());
- }
-
- 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());
-}
-
-void DOMMatrix::setIs2D(bool value) {
- if (m_is2D)
- m_is2D = value;
-}
-
-void DOMMatrix::setNAN() {
- m_matrix->setM11(NAN);
- m_matrix->setM12(NAN);
- m_matrix->setM13(NAN);
- m_matrix->setM14(NAN);
- m_matrix->setM21(NAN);
- m_matrix->setM22(NAN);
- m_matrix->setM23(NAN);
- m_matrix->setM24(NAN);
- m_matrix->setM31(NAN);
- m_matrix->setM32(NAN);
- m_matrix->setM33(NAN);
- m_matrix->setM34(NAN);
- m_matrix->setM41(NAN);
- m_matrix->setM42(NAN);
- m_matrix->setM43(NAN);
- m_matrix->setM44(NAN);
-}
-
-DOMMatrix* DOMMatrix::multiplySelf(DOMMatrixInit& other,
- ExceptionState& exceptionState) {
- DOMMatrix* otherMatrix = DOMMatrix::fromMatrix(other, exceptionState);
- if (!otherMatrix) {
- DCHECK(exceptionState.hadException());
- return nullptr;
- }
- if (!otherMatrix->is2D())
- m_is2D = false;
-
- *m_matrix *= otherMatrix->matrix();
-
- return this;
-}
-
-DOMMatrix* DOMMatrix::preMultiplySelf(DOMMatrixInit& other,
- ExceptionState& exceptionState) {
- DOMMatrix* otherMatrix = DOMMatrix::fromMatrix(other, exceptionState);
- if (!otherMatrix) {
- DCHECK(exceptionState.hadException());
- return nullptr;
- }
- if (!otherMatrix->is2D())
- m_is2D = false;
-
- TransformationMatrix& matrix = *m_matrix;
- *m_matrix = otherMatrix->matrix() * matrix;
-
- return this;
-}
-
-DOMMatrix* DOMMatrix::translateSelf(double tx, double ty, double tz) {
- if (!tx && !ty && !tz)
- return this;
-
- if (tz)
- m_is2D = false;
-
- if (m_is2D)
- m_matrix->translate(tx, ty);
- else
- m_matrix->translate3d(tx, ty, tz);
-
- return this;
-}
-
-DOMMatrix* DOMMatrix::scaleSelf(double sx) {
- return scaleSelf(sx, sx);
-}
-
-DOMMatrix* DOMMatrix::scaleSelf(double sx,
- double sy,
- double sz,
- double ox,
- double oy,
- double oz) {
- if (sz != 1 || oz)
- m_is2D = false;
-
- if (sx == 1 && sy == 1 && sz == 1)
- return this;
-
- bool hasTranslation = (ox || oy || oz);
-
- if (hasTranslation)
- translateSelf(ox, oy, oz);
-
- if (m_is2D)
- m_matrix->scaleNonUniform(sx, sy);
- else
- m_matrix->scale3d(sx, sy, sz);
-
- if (hasTranslation)
- translateSelf(-ox, -oy, -oz);
-
- return this;
-}
-
-DOMMatrix* DOMMatrix::scale3dSelf(double scale,
- double ox,
- double oy,
- double oz) {
- return scaleSelf(scale, scale, scale, ox, oy, oz);
-}
-
-DOMMatrix* DOMMatrix::rotateSelf(double rotX) {
- return rotateSelf(0, 0, rotX);
-}
-
-DOMMatrix* DOMMatrix::rotateSelf(double rotX, double rotY) {
- return rotateSelf(rotX, rotY, 0);
-}
-
-DOMMatrix* DOMMatrix::rotateSelf(double rotX, double rotY, double rotZ) {
- if (rotZ)
- m_matrix->rotate3d(0, 0, 1, rotZ);
-
- if (rotY) {
- m_matrix->rotate3d(0, 1, 0, rotY);
- m_is2D = false;
- }
-
- if (rotX) {
- m_matrix->rotate3d(1, 0, 0, rotX);
- m_is2D = false;
- }
-
- return this;
-}
-
-DOMMatrix* DOMMatrix::rotateFromVectorSelf(double x, double y) {
- m_matrix->rotate(rad2deg(atan2(y, x)));
- return this;
-}
-
-DOMMatrix* DOMMatrix::rotateAxisAngleSelf(double x,
- double y,
- double z,
- double angle) {
- m_matrix->rotate3d(x, y, z, angle);
-
- if (x != 0 || y != 0)
- m_is2D = false;
-
- return this;
-}
-
-DOMMatrix* DOMMatrix::skewXSelf(double sx) {
- m_matrix->skewX(sx);
- return this;
-}
-
-DOMMatrix* DOMMatrix::skewYSelf(double sy) {
- m_matrix->skewY(sy);
- return this;
-}
-
-DOMMatrix* DOMMatrix::invertSelf() {
- if (m_matrix->isInvertible()) {
- m_matrix = TransformationMatrix::create(m_matrix->inverse());
- } else {
- setNAN();
- setIs2D(false);
- }
- return this;
-}
-
-DOMMatrix* DOMMatrix::setMatrixValue(const String& inputString,
- ExceptionState& exceptionState) {
- setMatrixValueFromString(inputString, exceptionState);
- return this;
-}
-
-} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/dom/DOMMatrix.h ('k') | third_party/WebKit/Source/core/dom/DOMMatrix.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698