diff options
| author | Michael Wright <michaelwr@google.com> | 2014-02-05 18:02:40 -0800 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2014-02-10 12:59:34 -0800 |
| commit | a407d6a003d746fa0aff50f7ba5da61f19a85b75 (patch) | |
| tree | 47f16be39026a324f3aeff1d534932c7cb3cd03a /libs/input/InputWindow.h | |
| parent | d5154ec2bc7e7c0bdfd14fc784912d390afe43cc (diff) | |
| download | frameworks_base-a407d6a003d746fa0aff50f7ba5da61f19a85b75.zip frameworks_base-a407d6a003d746fa0aff50f7ba5da61f19a85b75.tar.gz frameworks_base-a407d6a003d746fa0aff50f7ba5da61f19a85b75.tar.bz2 | |
Remove SkRegion dependency from libinput
This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.
Change-Id: I755e6267996c93fe700f1056327386923287575a
Diffstat (limited to 'libs/input/InputWindow.h')
| -rw-r--r-- | libs/input/InputWindow.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/input/InputWindow.h b/libs/input/InputWindow.h index 28fa7ab..9618ffe 100644 --- a/libs/input/InputWindow.h +++ b/libs/input/InputWindow.h @@ -19,16 +19,17 @@ #include <input/Input.h> #include <input/InputTransport.h> +#include <ui/Rect.h> +#include <ui/Region.h> #include <utils/RefBase.h> #include <utils/Timers.h> #include <utils/String8.h> -#include <SkRegion.h> - #include "InputApplication.h" namespace android { + /* * Describes the properties of a window that can receive input. */ @@ -125,7 +126,7 @@ struct InputWindowInfo { int32_t frameRight; int32_t frameBottom; float scaleFactor; - SkRegion touchableRegion; + Region touchableRegion; bool visible; bool canReceiveKeys; bool hasFocus; @@ -137,6 +138,8 @@ struct InputWindowInfo { int32_t inputFeatures; int32_t displayId; + void addTouchableRegion(const Rect& region); + bool touchableRegionContainsPoint(int32_t x, int32_t y) const; bool frameContainsPoint(int32_t x, int32_t y) const; |