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.cpp | |
| 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.cpp')
| -rw-r--r-- | libs/input/InputWindow.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libs/input/InputWindow.cpp b/libs/input/InputWindow.cpp index fe61918..da59159 100644 --- a/libs/input/InputWindow.cpp +++ b/libs/input/InputWindow.cpp @@ -15,17 +15,24 @@ */ #define LOG_TAG "InputWindow" +#define LOG_NDEBUG 0 #include "InputWindow.h" #include <cutils/log.h> +#include <ui/Rect.h> +#include <ui/Region.h> + namespace android { // --- InputWindowInfo --- +void InputWindowInfo::addTouchableRegion(const Rect& region) { + touchableRegion.orSelf(region); +} bool InputWindowInfo::touchableRegionContainsPoint(int32_t x, int32_t y) const { - return touchableRegion.contains(x, y); + return touchableRegion.contains(x,y); } bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { |