Merge change 5521

* changes:
  Adding mouse events to the plugin API

1 files changed, 16 insertions, 4 deletions

diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h
index b5f5783..c11d448 100644
--- a/WebKit/android/plugins/android_npapi.h
+++ b/WebKit/android/plugins/android_npapi.h
@@ -700,10 +700,11 @@ struct ANPAudioTrackInterfaceV0 : ANPInterface {
 enum ANPEventTypes {
     kNull_ANPEventType          = 0,
     kKey_ANPEventType           = 1,
-    kTouch_ANPEventType         = 2,
-    kDraw_ANPEventType          = 3,
-    kLifecycle_ANPEventType     = 4,
-    kVisibleRect_ANPEventType   = 5,
+    kMouse_ANPEventType         = 2,
+    kTouch_ANPEventType         = 3,
+    kDraw_ANPEventType          = 4,
+    kLifecycle_ANPEventType     = 5,
+    kVisibleRect_ANPEventType   = 6,
 };
 typedef int32_t ANPEventType;
 
@@ -723,6 +724,12 @@ enum ANPKeyModifiers {
 // bit-field containing some number of ANPKeyModifier bits
 typedef uint32_t ANPKeyModifier;
 
+enum ANPMouseActions {
+    kDown_ANPMouseAction  = 0,
+    kUp_ANPMouseAction    = 1,
+};
+typedef int32_t ANPMouseAction;
+
 enum ANPTouchActions {
     kDown_ANPTouchAction   = 0,
     kUp_ANPTouchAction     = 1,
@@ -755,6 +762,11 @@ struct ANPEvent {
             int32_t         unichar;        // 0 if there is no value
         } key;
         struct {
+            ANPMouseAction  action;
+            int32_t         x;  // relative to your "window" (0...width)
+            int32_t         y;  // relative to your "window" (0...height)
+        } mouse;
+        struct {
             ANPTouchAction  action;
             ANPKeyModifier  modifiers;
             int32_t         x;  // relative to your "window" (0...width)