Index: third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp |
diff --git a/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp b/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp |
index 252d8e9d058b7cf1a4903d23745e798eada44724..a99b1478589adb2d50707bf68c360b9aeeab7b67 100644 |
--- a/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp |
+++ b/third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp |
@@ -34,6 +34,64 @@ DOMMatrixReadOnly::DOMMatrixReadOnly(Vector<double> sequence) |
} |
} |
+DOMMatrixReadOnly* DOMMatrixReadOnly::fromFloat32Array(DOMFloat32Array* float32Array, ExceptionState& exceptionState) |
+{ |
+ if (float32Array->length() != 6 && float32Array->length() != 16) { |
+ exceptionState.throwTypeError("An invalid number sequence is specified. The sequence must contain 6 elements for 2D matrix and 16 elements for 3D matrix."); |
+ return nullptr; |
+ } |
+ return new DOMMatrixReadOnly(float32Array); |
+} |
+ |
+DOMMatrixReadOnly::DOMMatrixReadOnly(DOMFloat32Array* float32Array) |
+{ |
+ float* array = float32Array->data(); |
+ if (float32Array->length() == 6) { |
zino
2016/09/04 23:11:53
This logic is duplicated with below constructor. (
Hwanseung Lee
2016/09/05 12:58:47
i did resolve it.
|
+ m_matrix = TransformationMatrix::create( |
+ array[0], array[1], array[2], array[3], |
+ array[4], array[5]); |
+ m_is2D = true; |
+ } else if (float32Array->length() == 16) { |
+ m_matrix = TransformationMatrix::create( |
+ array[0], array[1], array[2], array[3], |
+ array[4], array[5], array[6], array[7], |
+ array[8], array[9], array[10], array[11], |
+ array[12], array[13], array[14], array[15]); |
+ m_is2D = false; |
+ } else { |
+ NOTREACHED(); |
+ } |
+} |
+ |
+DOMMatrixReadOnly* DOMMatrixReadOnly::fromFloat64Array(DOMFloat64Array* float64Array, ExceptionState& exceptionState) |
+{ |
+ if (float64Array->length() != 6 && float64Array->length() != 16) { |
+ exceptionState.throwTypeError("An invalid number sequence is specified. The sequence must contain 6 elements for 2D matrix and 16 elements for 3D matrix."); |
+ return nullptr; |
+ } |
+ return new DOMMatrixReadOnly(float64Array); |
+} |
+ |
+DOMMatrixReadOnly::DOMMatrixReadOnly(DOMFloat64Array* float64Array) |
+{ |
+ double* array = float64Array->data(); |
+ if (float64Array->length() == 6) { |
+ m_matrix = TransformationMatrix::create( |
+ array[0], array[1], array[2], array[3], |
+ array[4], array[5]); |
+ m_is2D = true; |
+ } else if (float64Array->length() == 16) { |
+ m_matrix = TransformationMatrix::create( |
+ array[0], array[1], array[2], array[3], |
+ array[4], array[5], array[6], array[7], |
+ array[8], array[9], array[10], array[11], |
+ array[12], array[13], array[14], array[15]); |
+ m_is2D = false; |
+ } else { |
+ NOTREACHED(); |
+ } |
+} |
+ |
DOMMatrixReadOnly::~DOMMatrixReadOnly() |
{ |
} |