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

Bug 1083395 - Replace the touch block balance with an input block identifier. r=botond

Browse Source
This commit is contained in:
Kartikaya Gupta
2014-10-24 13:29:30 -04:00
parent ad51d228db
commit 0b12b07fa8
31 changed files with 403 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
widget/android/AndroidJavaWrappers.h
View File

@@ -487,11 +487,12 @@ public:
return event;
}
static AndroidGeckoEvent* MakeApzInputEvent(const MultiTouchInput& aInput, const mozilla::layers::ScrollableLayerGuid& aGuid) {
static AndroidGeckoEvent* MakeApzInputEvent(const MultiTouchInput& aInput, const mozilla::layers::ScrollableLayerGuid& aGuid, uint64_t aInputBlockId) {
AndroidGeckoEvent* event = new AndroidGeckoEvent();
event->Init(APZ_INPUT_EVENT);
event->mApzInput = aInput;
event->mApzGuid = aGuid;
event->mApzInputBlockId = aInputBlockId;
return event;
}
@@ -560,6 +561,7 @@ public:
void UnionRect(nsIntRect const& aRect);
nsIObserver *Observer() { return mObserver; }
mozilla::layers::ScrollableLayerGuid ApzGuid();
uint64_t ApzInputBlockId();
protected:
int mAction;
@@ -602,6 +604,7 @@ protected:
nsTArray<nsString> mPrefNames;
MultiTouchInput mApzInput;
mozilla::layers::ScrollableLayerGuid mApzGuid;
uint64_t mApzInputBlockId;
AutoGlobalWrappedJavaObject mObject;
void ReadIntArray(nsTArray<int> &aVals,