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

Unified Diff: third_party/WebKit/Source/modules/sensor/OrientationSensor.cpp

Issue 2785493002: [Sensors] OrientationSensor.populateMatrix() works also with Float64Array and DOMMatrix types (Closed)
Patch Set: Comments from Reilly 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
Index: third_party/WebKit/Source/modules/sensor/OrientationSensor.cpp
diff --git a/third_party/WebKit/Source/modules/sensor/OrientationSensor.cpp b/third_party/WebKit/Source/modules/sensor/OrientationSensor.cpp
index 7a4ea244f1319c811d9e28831af458ee08d72e69..c04e065940004d6f215b10dbb863e467d8e5104d 100644
--- a/third_party/WebKit/Source/modules/sensor/OrientationSensor.cpp
+++ b/third_party/WebKit/Source/modules/sensor/OrientationSensor.cpp
@@ -5,6 +5,7 @@
#include "modules/sensor/OrientationSensor.h"
#include "bindings/core/v8/ExceptionState.h"
+#include "core/geometry/DOMMatrix.h"
using device::mojom::blink::SensorType;
@@ -20,9 +21,65 @@ Vector<double> OrientationSensor::quaternion(bool& isNull) {
readingValueUnchecked(2)}); // Vz
}
-void OrientationSensor::populateMatrix(DOMFloat32Array* buffer,
- ExceptionState& exceptionState) {
- if (buffer->length() < 16) {
+template <typename T>
+void doPopulateMatrix(T* targetMatrix, double x, double y, double z, double w) {
+ auto out = targetMatrix->data();
+ out[0] = 1.0 - 2 * (y * y + z * z);
+ out[1] = 2 * (x * y - z * w);
+ out[2] = 2 * (x * z + y * w);
+ out[3] = 0.0;
+ out[4] = 2 * (x * y + z * w);
+ out[5] = 1.0 - 2 * (x * x + z * z);
+ out[6] = 2 * (y * z - x * w);
+ out[7] = 0.0;
+ out[8] = 2 * (x * z - y * w);
+ out[9] = 2 * (y * z + x * w);
+ out[10] = 1.0 - 2 * (x * x + y * y);
+ out[11] = 0.0;
+ out[12] = 0.0;
+ out[13] = 0.0;
+ out[14] = 0.0;
+ out[15] = 1.0;
+}
+
+template <>
+void doPopulateMatrix(DOMMatrix* targetMatrix,
+ double x,
+ double y,
+ double z,
+ double w) {
+ targetMatrix->setM11(1.0 - 2 * (y * y + z * z));
+ targetMatrix->setM12(2 * (x * y - z * w));
+ targetMatrix->setM13(2 * (x * z + y * w));
+ targetMatrix->setM14(0.0);
+ targetMatrix->setM21(2 * (x * y + z * w));
+ targetMatrix->setM22(1.0 - 2 * (x * x + z * z));
+ targetMatrix->setM23(2 * y * z - 2 * x * w);
+ targetMatrix->setM24(0.0);
+ targetMatrix->setM31(2 * (x * z - y * w));
+ targetMatrix->setM32(2 * (y * z + x * w));
+ targetMatrix->setM33(1.0 - 2 * (x * x + y * y));
+ targetMatrix->setM34(0.0);
+ targetMatrix->setM41(0.0);
+ targetMatrix->setM42(0.0);
+ targetMatrix->setM43(0.0);
+ targetMatrix->setM44(1.0);
+}
+
+template <typename T>
+bool checkBufferLength(T* buffer) {
+ return buffer->length() >= 16;
+}
+
+template <>
+bool checkBufferLength(DOMMatrix*) {
+ return true;
+}
+
+template <typename Matrix>
+void OrientationSensor::populateMatrixInternal(Matrix* targetMatrix,
+ ExceptionState& exceptionState) {
+ if (!checkBufferLength(targetMatrix)) {
exceptionState.throwTypeError(
"Target buffer must have at least 16 elements.");
return;
@@ -35,22 +92,25 @@ void OrientationSensor::populateMatrix(DOMFloat32Array* buffer,
if (!canReturnReadings())
return;
- float x = readingValueUnchecked(0);
- float y = readingValueUnchecked(1);
- float z = readingValueUnchecked(2);
- float w = readingValueUnchecked(3);
+ double x = readingValueUnchecked(0);
+ double y = readingValueUnchecked(1);
+ double z = readingValueUnchecked(2);
+ double w = readingValueUnchecked(3);
- float* out = buffer->data();
- out[0] = 1.0 - 2 * (y * y - z * z);
- out[1] = 2 * (x * y - z * w);
- out[2] = 2 * (x * z + y * w);
- out[4] = 2 * (x * y + z * w);
- out[5] = 1.0 - 2 * (x * x - z * z);
- out[6] = 2 * (y * z - x * w);
- out[8] = 2 * (x * z - y * w);
- out[9] = 2 * (y * z + x * w);
- out[10] = 1.0 - 2 * (x * x - y * y);
- out[15] = 1.0;
+ doPopulateMatrix(targetMatrix, x, y, z, w);
+}
+
+void OrientationSensor::populateMatrix(
+ Float32ArrayOrFloat64ArrayOrDOMMatrix& matrix,
+ ExceptionState& exceptionState) {
+ if (matrix.isFloat32Array())
+ populateMatrixInternal(matrix.getAsFloat32Array(), exceptionState);
+ else if (matrix.isFloat64Array())
+ populateMatrixInternal(matrix.getAsFloat64Array(), exceptionState);
+ else if (matrix.isDOMMatrix())
+ populateMatrixInternal(matrix.getAsDOMMatrix(), exceptionState);
+ else
+ NOTREACHED() << "Unexpected rotation matrix type.";
}
bool OrientationSensor::isReadingDirty() const {

Powered by Google App Engine
This is Rietveld 408576698