From a407d6a003d746fa0aff50f7ba5da61f19a85b75 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Wed, 5 Feb 2014 18:02:40 -0800
Subject: 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
---
 libs/input/InputWindow.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'libs/input/InputWindow.h')

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;
 
-- 
cgit v1.1