From 313eff7bb7e5eedbdbea805343451fd473241266 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 15 Jul 2013 18:07:09 -0700 Subject: Completely remove skia dependency from libinput. Including the tests... Change-Id: I6ec8f1a5ae7e7514831d7e3b430b3b37b0841b92 --- libs/input/tests/InputEvent_test.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'libs/input/tests/InputEvent_test.cpp') diff --git a/libs/input/tests/InputEvent_test.cpp b/libs/input/tests/InputEvent_test.cpp index ab1feb3..78ea98e 100644 --- a/libs/input/tests/InputEvent_test.cpp +++ b/libs/input/tests/InputEvent_test.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include @@ -519,6 +518,20 @@ TEST_F(MotionEventTest, Parcel) { ASSERT_NO_FATAL_FAILURE(assertEqualsEventWithHistory(&outEvent)); } +static void setRotationMatrix(float matrix[9], float angle) { + float sin = sinf(angle); + float cos = cosf(angle); + matrix[0] = cos; + matrix[1] = -sin; + matrix[2] = 0; + matrix[3] = sin; + matrix[4] = cos; + matrix[5] = 0; + matrix[6] = 0; + matrix[7] = 0; + matrix[8] = 1.0f; +} + TEST_F(MotionEventTest, Transform) { // Generate some points on a circle. // Each point 'i' is a point on a circle of radius ROTATION centered at (3,2) at an angle @@ -561,9 +574,9 @@ TEST_F(MotionEventTest, Transform) { ASSERT_NEAR(originalRawY, event.getRawY(0), 0.001); // Apply a rotation about the origin by ROTATION degrees clockwise. - SkMatrix matrix; - matrix.setRotate(ROTATION); - event.transform(&matrix); + float matrix[9]; + setRotationMatrix(matrix, ROTATION * PI_180); + event.transform(matrix); // Check the points. for (size_t i = 0; i < pointerCount; i++) { -- cgit v1.1