corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout 8b74d5ae78c3 & c619bbb2951f (bug 734391), 772c994fa869 (bug 734324), fd23ff0f9dd1 (bug 734325), d1e037a9390e (bug 733653), 3a7bf79b5b2d (bug 733650) & 9d9392fce538 (bug 733652) for OS X M1 & M3 orange

Browse Source
This commit is contained in:
Ed Morley
2012-03-13 22:29:29 +00:00
parent 8457bc1d6e
commit 74f35e0ce5
39 changed files with 725 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
widget/android/AndroidJavaWrappers.h
View File

@@ -384,6 +384,25 @@ public:
static jmethodID jGetTimeMethod;
};
class AndroidAddress : public WrappedJavaObject
{
public:
static void InitAddressClass(JNIEnv *jEnv);
static nsGeoPositionAddress* CreateGeoPositionAddress(JNIEnv *jenv, jobject jobj);
static jclass jAddressClass;
static jmethodID jGetAddressLineMethod;
static jmethodID jGetAdminAreaMethod;
static jmethodID jGetCountryNameMethod;
static jmethodID jGetFeatureNameMethod;
static jmethodID jGetLocalityMethod;
static jmethodID jGetPostalCodeMethod;
static jmethodID jGetPremisesMethod;
static jmethodID jGetSubAdminAreaMethod;
static jmethodID jGetSubLocalityMethod;
static jmethodID jGetSubThoroughfareMethod;
static jmethodID jGetThoroughfareMethod;
};
class AndroidGeckoEvent : public WrappedJavaObject
{
public:
@@ -420,6 +439,9 @@ public:
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; }
double X() { return mX; }
double Y() { return mY; }
double Z() { return mZ; }
@@ -439,6 +461,7 @@ public:
int RangeForeColor() { return mRangeForeColor; }
int RangeBackColor() { return mRangeBackColor; }
nsGeoPosition* GeoPosition() { return mGeoPosition; }
nsGeoPositionAddress* GeoAddress() { return mGeoAddress; }
double Bandwidth() { return mBandwidth; }
bool CanBeMetered() { return mCanBeMetered; }
@@ -457,11 +480,13 @@ protected:
int mOffset, mCount;
int mRangeType, mRangeStyles;
int mRangeForeColor, mRangeBackColor;
double mAlpha, mBeta, mGamma;
double mX, mY, mZ;
double mDistance;
int mPointerIndex;
nsString mCharacters, mCharactersExtra;
nsRefPtr<nsGeoPosition> mGeoPosition;
nsRefPtr<nsGeoPositionAddress> mGeoAddress;
double mBandwidth;
bool mCanBeMetered;
@@ -490,6 +515,9 @@ protected:
static jfieldID jOrientations;
static jfieldID jPressures;
static jfieldID jPointRadii;
static jfieldID jAlphaField;
static jfieldID jBetaField;
static jfieldID jGammaField;
static jfieldID jXField;
static jfieldID jYField;
static jfieldID jZField;
@@ -511,6 +539,7 @@ protected:
static jfieldID jRangeForeColorField;
static jfieldID jRangeBackColorField;
static jfieldID jLocationField;
static jfieldID jAddressField;
static jfieldID jBandwidthField;
static jfieldID jCanBeMeteredField;
@@ -520,8 +549,8 @@ public:
NATIVE_POKE = 0,
KEY_EVENT = 1,
MOTION_EVENT = 2,
SENSOR_EVENT = 3,
UNUSED1_EVENT = 4,
ORIENTATION_EVENT = 3,
ACCELERATION_EVENT = 4,
LOCATION_EVENT = 5,
IME_EVENT = 6,
DRAW = 7,
@@ -542,7 +571,6 @@ public:
PROXIMITY_EVENT = 23,
ACTIVITY_RESUMING = 24,
SCREENSHOT = 25,
SENSOR_ACCURACY = 26,
dummy_java_enum_list_end
};