| Index: third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp b/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp
|
| index 6857417126483ece74e48bc256f035885c371f75..538249e9552e015e29d5d5bffaa81069af80bf87 100644
|
| --- a/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/DOMPointReadOnly.cpp
|
| @@ -4,8 +4,12 @@
|
|
|
| #include "core/dom/DOMPointReadOnly.h"
|
|
|
| +#include "bindings/core/v8/ExceptionState.h"
|
| #include "bindings/core/v8/ScriptValue.h"
|
| #include "bindings/core/v8/V8ObjectBuilder.h"
|
| +#include "core/dom/DOMMatrixInit.h"
|
| +#include "core/dom/DOMMatrixReadOnly.h"
|
| +#include "core/dom/DOMPoint.h"
|
| #include "core/dom/DOMPointInit.h"
|
|
|
| namespace blink {
|
| @@ -31,6 +35,31 @@ DOMPointReadOnly* DOMPointReadOnly::fromPoint(const DOMPointInit& other) {
|
| return new DOMPointReadOnly(other.x(), other.y(), other.z(), other.w());
|
| }
|
|
|
| +DOMPoint* DOMPointReadOnly::matrixTransform(DOMMatrixInit& other,
|
| + ExceptionState& exceptionState) {
|
| + DOMMatrixReadOnly* matrix =
|
| + DOMMatrixReadOnly::fromMatrix(other, exceptionState);
|
| +
|
| + if (matrix->is2D() && z() == 0 && w() == 1) {
|
| + double transformedX =
|
| + x() * matrix->m11() + y() * matrix->m12() + matrix->m41();
|
| + double transformedY =
|
| + x() * matrix->m12() + y() * matrix->m22() + matrix->m42();
|
| + return DOMPoint::create(transformedX, transformedY, 0, 1);
|
| + }
|
| +
|
| + double transformedX = x() * matrix->m11() + y() * matrix->m21() +
|
| + z() * matrix->m31() + w() * matrix->m41();
|
| + double transformedY = x() * matrix->m12() + y() * matrix->m22() +
|
| + z() * matrix->m32() + w() * matrix->m42();
|
| + double transformedZ = x() * matrix->m13() + y() * matrix->m23() +
|
| + z() * matrix->m33() + w() * matrix->m43();
|
| + double transformedW = x() * matrix->m14() + y() * matrix->m24() +
|
| + z() * matrix->m34() + w() * matrix->m44();
|
| + return DOMPoint::create(transformedX, transformedY, transformedZ,
|
| + transformedW);
|
| +}
|
| +
|
| DOMPointReadOnly::DOMPointReadOnly(double x, double y, double z, double w)
|
| : m_x(x), m_y(y), m_z(z), m_w(w) {}
|
|
|
|
|