diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-07-15 18:07:09 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-07-15 18:49:00 -0700 |
| commit | 313eff7bb7e5eedbdbea805343451fd473241266 (patch) | |
| tree | b182f23d315b014c87066bee557c2ff1d78f9bac /include/input/Input.h | |
| parent | 5a2f68e5a5526ba80b5192776e2f0e349626777d (diff) | |
| download | frameworks_native-313eff7bb7e5eedbdbea805343451fd473241266.tar.gz frameworks_native-313eff7bb7e5eedbdbea805343451fd473241266.tar.bz2 frameworks_native-313eff7bb7e5eedbdbea805343451fd473241266.zip | |
Completely remove skia dependency from libinput.
Including the tests...
Change-Id: I6ec8f1a5ae7e7514831d7e3b430b3b37b0841b92
Diffstat (limited to 'include/input/Input.h')
| -rw-r--r-- | include/input/Input.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index 9abaaea8d..e77807634 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -28,10 +28,6 @@ #include <utils/RefBase.h> #include <utils/String8.h> -#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; |