Bug 888482 - Make new event to set layer client in Gecko; r=snorp

This commit is contained in:
Jim Chen
2014-09-30 18:20:58 -04:00
parent f01182759b
commit bbd6763453
4 changed files with 45 additions and 0 deletions

View File

@@ -552,6 +552,7 @@ public:
float GamepadButtonValue() { return mGamepadButtonValue; }
const nsTArray<float>& GamepadValues() { return mGamepadValues; }
int RequestId() { return mCount; } // for convenience
const AutoGlobalWrappedJavaObject& Object() { return mObject; }
bool CanCoalesceWith(AndroidGeckoEvent* ae);
WidgetTouchEvent MakeTouchEvent(nsIWidget* widget);
MultiTouchInput MakeMultiTouchInput(nsIWidget* widget);
@@ -601,6 +602,7 @@ protected:
nsTArray<nsString> mPrefNames;
MultiTouchInput mApzInput;
mozilla::layers::ScrollableLayerGuid mApzGuid;
AutoGlobalWrappedJavaObject mObject;
void ReadIntArray(nsTArray<int> &aVals,
JNIEnv *jenv,
@@ -685,6 +687,8 @@ protected:
static jfieldID jGamepadButtonValueField;
static jfieldID jGamepadValuesField;
static jfieldID jObjectField;
static jclass jDomKeyLocationClass;
static jfieldID jDomKeyLocationValueField;
@@ -694,6 +698,7 @@ public:
KEY_EVENT = 1,
MOTION_EVENT = 2,
SENSOR_EVENT = 3,
PROCESS_OBJECT = 4,
LOCATION_EVENT = 5,
IME_EVENT = 6,
SIZE_CHANGED = 8,
@@ -766,6 +771,11 @@ public:
ACTION_GAMEPAD_BUTTON = 1,
ACTION_GAMEPAD_AXES = 2
};
enum {
ACTION_OBJECT_LAYER_CLIENT = 1,
dummy_object_enum_list_end
};
};
class nsJNIString : public nsString