Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 04:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1615858 - Add MultiTouchInput::SingleTouchData::mHistoricalData. r=kats

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D95649
This commit is contained in:
Markus Stange 2020-11-03 16:46:19 +00:00
parent 7ec6cea937
commit fc8aedee99
3 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
widget/InputData.cpp
View File

@ -146,8 +146,11 @@ void MultiTouchInput::Translate(const ScreenPoint& aTranslation) {
const int32_t xTranslation = (int32_t)(aTranslation.x + 0.5f);
const int32_t yTranslation = (int32_t)(aTranslation.y + 0.5f);
for (auto iter = mTouches.begin(); iter != mTouches.end(); iter++) {
iter->mScreenPoint.MoveBy(xTranslation, yTranslation);
for (auto& touchData : mTouches) {
for (auto& historicalData : touchData.mHistoricalData) {
historicalData.mScreenPoint.MoveBy(xTranslation, yTranslation);
}
touchData.mScreenPoint.MoveBy(xTranslation, yTranslation);
}
}
@ -205,13 +208,21 @@ int32_t MultiTouchInput::IndexOfTouch(int32_t aTouchIdentifier) {
bool MultiTouchInput::TransformToLocal(
const ScreenToParentLayerMatrix4x4& aTransform) {
for (size_t i = 0; i < mTouches.Length(); i++) {
for (auto& touchData : mTouches) {
for (auto& historicalData : touchData.mHistoricalData) {
Maybe<ParentLayerIntPoint> historicalPoint =
UntransformBy(aTransform, historicalData.mScreenPoint);
if (!historicalPoint) {
return false;
}
historicalData.mLocalScreenPoint = *historicalPoint;
}
Maybe<ParentLayerIntPoint> point =
UntransformBy(aTransform, mTouches[i].mScreenPoint);
UntransformBy(aTransform, touchData.mScreenPoint);
if (!point) {
return false;
}
mTouches[i].mLocalScreenPoint = *point;
touchData.mLocalScreenPoint = *point;
}
return true;
}

22
widget/InputData.h
View File

@ -149,6 +149,28 @@ class SingleTouchData {
// Warning, this class is serialized and sent over IPC. Any change to its
// fields must be reflected in its ParamTraits<>, in nsGUIEventIPC.h
// Historical data of this touch, which was coalesced into this event.
// Touch event coalescing can happen at the system level when the touch
// screen's sampling frequency is higher than the vsync rate, or when the
// UI thread is busy. When multiple "samples" of touch data are coalesced into
// one touch event, the touch event's regular position information is the
// information from the last sample. And the previous, "coalesced-away"
// samples are stored in mHistoricalData.
struct HistoricalTouchData {
// The timestamp at which the information in this "sample" was originally
// sampled.
TimeStamp mTimeStamp;
// The touch data of this historical sample.
ScreenIntPoint mScreenPoint;
ParentLayerPoint mLocalScreenPoint;
ScreenSize mRadius;
float mRotationAngle = 0.0f;
float mForce = 0.0f;
};
CopyableTArray<HistoricalTouchData> mHistoricalData;
// A unique number assigned to each SingleTouchData within a MultiTouchInput
// so that they can be easily distinguished when handling a touch
// start/move/end.

28
widget/nsGUIEventIPC.h
View File

@ -1124,11 +1124,36 @@ struct ParamTraits<mozilla::InputData> {
}
};
template <>
struct ParamTraits<mozilla::SingleTouchData::HistoricalTouchData> {
typedef mozilla::SingleTouchData::HistoricalTouchData paramType;
static void Write(Message* aMsg, const paramType& aParam) {
WriteParam(aMsg, aParam.mTimeStamp);
WriteParam(aMsg, aParam.mScreenPoint);
WriteParam(aMsg, aParam.mLocalScreenPoint);
WriteParam(aMsg, aParam.mRadius);
WriteParam(aMsg, aParam.mRotationAngle);
WriteParam(aMsg, aParam.mForce);
}
static bool Read(const Message* aMsg, PickleIterator* aIter,
paramType* aResult) {
return (ReadParam(aMsg, aIter, &aResult->mTimeStamp) &&
ReadParam(aMsg, aIter, &aResult->mScreenPoint) &&
ReadParam(aMsg, aIter, &aResult->mLocalScreenPoint) &&
ReadParam(aMsg, aIter, &aResult->mRadius) &&
ReadParam(aMsg, aIter, &aResult->mRotationAngle) &&
ReadParam(aMsg, aIter, &aResult->mForce));
}
};
template <>
struct ParamTraits<mozilla::SingleTouchData> {
typedef mozilla::SingleTouchData paramType;
static void Write(Message* aMsg, const paramType& aParam) {
WriteParam(aMsg, aParam.mHistoricalData);
WriteParam(aMsg, aParam.mIdentifier);
WriteParam(aMsg, aParam.mScreenPoint);
WriteParam(aMsg, aParam.mLocalScreenPoint);
@ -1139,7 +1164,8 @@ struct ParamTraits<mozilla::SingleTouchData> {
static bool Read(const Message* aMsg, PickleIterator* aIter,
paramType* aResult) {
return (ReadParam(aMsg, aIter, &aResult->mIdentifier) &&
return (ReadParam(aMsg, aIter, &aResult->mHistoricalData) &&
ReadParam(aMsg, aIter, &aResult->mIdentifier) &&
ReadParam(aMsg, aIter, &aResult->mScreenPoint) &&
ReadParam(aMsg, aIter, &aResult->mLocalScreenPoint) &&
ReadParam(aMsg, aIter, &aResult->mRadius) &&