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

Backout 533faa3c50ed, 718abc1bd4ad, af2d5272c06b, ad5554e1345d, c9ef1b41b829, d3a825311d11, 0a51bcb3eb9e, a01a327e8ec4, 973b0ed30b8b, 39851bbcfaa1 & a92d2d2a3b0e (bug 805162), d4884aab5ce6, 06fcbaf40cb4, daccc3fe7c70, 881eb2a2906e, 76232441ae06, 01ae34fa1b3f & 5f405fc4e323 (bug 783092), a03d8d4db1c2, 49beb3801192, 174634554a97, 0bd27e755a83, 19e8f151ca67, a6604e038bc0, ed3b8237e76e & 082cf8d72554 (bug 785945) for bustage or conflicting with backout of said bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley
2012-11-01 00:16:35 +00:00
parent 9f178d999c
commit e878f44e88
63 changed files with 1496 additions and 3254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
widget/android/AndroidJavaWrappers.h
View File

@@ -676,9 +676,8 @@ public:
int Flags() { return mFlags; }
int UnicodeChar() { return mUnicodeChar; }
int RepeatCount() const { return mRepeatCount; }
int Offset() { return mOffset; }
int Count() { return mCount; }
int Start() { return mStart; }
int End() { return mEnd; }
int PointerIndex() { return mPointerIndex; }
int RangeType() { return mRangeType; }
int RangeStyles() { return mRangeStyles; }
@@ -704,8 +703,7 @@ protected:
int mDomKeyLocation;
int mKeyCode, mUnicodeChar;
int mRepeatCount;
int mCount;
int mStart, mEnd;
int mOffset, mCount;
int mRangeType, mRangeStyles;
int mRangeForeColor, mRangeBackColor;
double mX, mY, mZ;
@@ -755,9 +753,8 @@ protected:
static jfieldID jMetaStateField;
static jfieldID jDomKeyLocationField;
static jfieldID jFlagsField;
static jfieldID jOffsetField;
static jfieldID jCountField;
static jfieldID jStartField;
static jfieldID jEndField;
static jfieldID jPointerIndexField;
static jfieldID jUnicodeCharField;
static jfieldID jRepeatCountField;
@@ -810,12 +807,14 @@ public:
};
enum {
IME_SYNCHRONIZE = 0,
IME_REPLACE_TEXT = 1,
IME_SET_SELECTION = 2,
IME_ADD_COMPOSITION_RANGE = 3,
IME_UPDATE_COMPOSITION = 4,
IME_REMOVE_COMPOSITION = 5
IME_COMPOSITION_END = 0,
IME_COMPOSITION_BEGIN = 1,
IME_SET_TEXT = 2,
IME_GET_TEXT = 3,
IME_DELETE_TEXT = 4,
IME_SET_SELECTION = 5,
IME_GET_SELECTION = 6,
IME_ADD_RANGE = 7
};
};