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 --- include/input/Input.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'include/input') diff --git a/include/input/Input.h b/include/input/Input.h index 9abaaea8d6..e77807634d 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -28,10 +28,6 @@ #include #include -#ifdef HAVE_ANDROID_OS -class SkMatrix; -#endif - /* * Additional private constants not defined in ndk/ui/input.h. */ @@ -533,23 +529,6 @@ public: // Matrix is in row-major form and compatible with SkMatrix. void transform(const float matrix[9]); -#ifdef SkMatrix_DEFINED - // Helper for interoperating with Skia matrices since Skia isn't part of the PDK. - inline void transform(const SkMatrix* matrix) { - float m[9]; - m[0] = SkScalarToFloat(matrix->get(SkMatrix::kMScaleX)); - m[1] = SkScalarToFloat(matrix->get(SkMatrix::kMSkewX)); - m[2] = SkScalarToFloat(matrix->get(SkMatrix::kMTransX)); - m[3] = SkScalarToFloat(matrix->get(SkMatrix::kMSkewY)); - m[4] = SkScalarToFloat(matrix->get(SkMatrix::kMScaleY)); - m[5] = SkScalarToFloat(matrix->get(SkMatrix::kMTransY)); - m[6] = SkScalarToFloat(matrix->get(SkMatrix::kMPersp0)); - m[7] = SkScalarToFloat(matrix->get(SkMatrix::kMPersp1)); - m[8] = SkScalarToFloat(matrix->get(SkMatrix::kMPersp2)); - transform(m); - } -#endif - #ifdef HAVE_ANDROID_OS status_t readFromParcel(Parcel* parcel); status_t writeToParcel(Parcel* parcel) const; -- cgit v1.2.3-59-g8ed1b