Bug 603008 - Android widget multitouch implementation. r=blassey,kats

This commit is contained in:
Wes Johnston
2012-01-25 01:31:33 +01:00
parent a2b7a059f4
commit 8d356f0cea
16 changed files with 509 additions and 104 deletions

View File

@@ -434,9 +434,11 @@ public:
int Action() { return mAction; }
int Type() { return mType; }
int64_t Time() { return mTime; }
const nsIntPoint& P0() { return mP0; }
const nsIntPoint& P1() { return mP1; }
const nsIntPoint& P2() { return mP2; }
nsTArray<nsIntPoint> Points() { return mPoints; }
nsTArray<int> PointIndicies() { return mPointIndicies; }
nsTArray<float> Pressures() { return mPressures; }
nsTArray<float> Orientations() { return mOrientations; }
nsTArray<nsIntPoint> PointRadii() { return mPointRadii; }
double Alpha() { return mAlpha; }
double Beta() { return mBeta; }
double Gamma() { return mGamma; }
@@ -452,6 +454,7 @@ public:
int UnicodeChar() { return mUnicodeChar; }
int Offset() { return mOffset; }
int Count() { return mCount; }
int PointerIndex() { return mPointerIndex; }
int RangeType() { return mRangeType; }
int RangeStyles() { return mRangeStyles; }
int RangeForeColor() { return mRangeForeColor; }
@@ -465,9 +468,11 @@ protected:
int mAction;
int mType;
int64_t mTime;
nsIntPoint mP0;
nsIntPoint mP1;
nsIntPoint mP2;
nsTArray<nsIntPoint> mPoints;
nsTArray<nsIntPoint> mPointRadii;
nsTArray<int> mPointIndicies;
nsTArray<float> mOrientations;
nsTArray<float> mPressures;
nsIntRect mRect;
int mFlags, mMetaState;
int mKeyCode, mUnicodeChar;
@@ -476,15 +481,25 @@ protected:
int mRangeForeColor, mRangeBackColor;
double mAlpha, mBeta, mGamma;
double mX, mY, mZ;
int mPointerIndex;
nsString mCharacters, mCharactersExtra;
nsRefPtr<nsGeoPosition> mGeoPosition;
nsRefPtr<nsGeoPositionAddress> mGeoAddress;
double mBandwidth;
bool mCanBeMetered;
void ReadP0Field(JNIEnv *jenv);
void ReadP1Field(JNIEnv *jenv);
void ReadP2Field(JNIEnv *jenv);
void ReadIntArray(nsTArray<int> &aVals,
JNIEnv *jenv,
jfieldID field,
PRUint32 count);
void ReadFloatArray(nsTArray<float> &aVals,
JNIEnv *jenv,
jfieldID field,
PRUint32 count);
void ReadPointArray(nsTArray<nsIntPoint> &mPoints,
JNIEnv *jenv,
jfieldID field,
PRUint32 count);
void ReadRectField(JNIEnv *jenv);
void ReadCharactersField(JNIEnv *jenv);
void ReadCharactersExtraField(JNIEnv *jenv);
@@ -493,9 +508,11 @@ protected:
static jfieldID jActionField;
static jfieldID jTypeField;
static jfieldID jTimeField;
static jfieldID jP0Field;
static jfieldID jP1Field;
static jfieldID jP2Field;
static jfieldID jPoints;
static jfieldID jPointIndicies;
static jfieldID jOrientations;
static jfieldID jPressures;
static jfieldID jPointRadii;
static jfieldID jAlphaField;
static jfieldID jBetaField;
static jfieldID jGammaField;
@@ -512,6 +529,7 @@ protected:
static jfieldID jFlagsField;
static jfieldID jOffsetField;
static jfieldID jCountField;
static jfieldID jPointerIndexField;
static jfieldID jUnicodeCharField;
static jfieldID jRangeTypeField;
static jfieldID jRangeStylesField;