wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 898443 - Always use the innermost APZC containing all touch points for multi-touch inputs. r=BenWa

Browse Source
This commit is contained in:
Kartikaya Gupta 2013-08-21 12:03:03 -04:00
parent f5135c8214
commit 07a7fa46a1
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gfx/layers/composite/APZCTreeManager.cpp
View File

@ -218,6 +218,11 @@ APZCTreeManager::ReceiveInputEvent(const InputData& aEvent)
const MultiTouchInput& multiTouchInput = aEvent.AsMultiTouchInput();
if (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_START) {
mApzcForInputBlock = GetTargetAPZC(ScreenPoint(multiTouchInput.mTouches[0].mScreenPoint));
for (size_t i = 1; i < multiTouchInput.mTouches.Length(); i++) {
nsRefPtr<AsyncPanZoomController> apzc2 = GetTargetAPZC(ScreenPoint(multiTouchInput.mTouches[i].mScreenPoint));
mApzcForInputBlock = CommonAncestor(mApzcForInputBlock.get(), apzc2.get());
APZC_LOG("Using APZC %p as the common ancestor\n", mApzcForInputBlock.get());
}
} else if (mApzcForInputBlock) {
APZC_LOG("Re-using APZC %p as continuation of event block\n", mApzcForInputBlock.get());
// If we have an mApzcForInputBlock and it's the end of the touch sequence
@ -278,6 +283,13 @@ APZCTreeManager::ReceiveInputEvent(const nsInputEvent& aEvent,
if (touchEvent.message == NS_TOUCH_START) {
nsIntPoint point = touchEvent.touches[0]->mRefPoint;
mApzcForInputBlock = GetTargetAPZC(ScreenPoint(point.x, point.y));
for (size_t i = 1; i < touchEvent.touches.Length(); i++) {
point = touchEvent.touches[i]->mRefPoint;
nsRefPtr<AsyncPanZoomController> apzc2 =
GetTargetAPZC(ScreenPoint(point.x, point.y));
mApzcForInputBlock = CommonAncestor(mApzcForInputBlock.get(), apzc2.get());
APZC_LOG("Using APZC %p as the common ancestor\n", mApzcForInputBlock.get());
}
} else if (mApzcForInputBlock) {
APZC_LOG("Re-using APZC %p as continuation of event block\n", mApzcForInputBlock.get());
// If we have an mApzcForInputBlock and it's the end of the touch sequence
@ -605,5 +617,47 @@ APZCTreeManager::GetInputTransforms(AsyncPanZoomController *aApzc, gfx3DMatrix&
}
}
AsyncPanZoomController*
APZCTreeManager::CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2)
{
// If either aApzc1 or aApzc2 is null, min(depth1, depth2) will be 0 and this function
// will return null.
// Calculate depth of the APZCs in the tree
int depth1 = 0, depth2 = 0;
for (AsyncPanZoomController* parent = aApzc1; parent; parent = parent->GetParent()) {
depth1++;
}
for (AsyncPanZoomController* parent = aApzc2; parent; parent = parent->GetParent()) {
depth2++;
}
// At most one of the following two loops will be executed; the deeper APZC pointer
// will get walked up to the depth of the shallower one.
int minDepth = depth1 < depth2 ? depth1 : depth2;
while (depth1 > minDepth) {
depth1--;
aApzc1 = aApzc1->GetParent();
}
while (depth2 > minDepth) {
depth2--;
aApzc2 = aApzc2->GetParent();
}
// Walk up the ancestor chains of both APZCs, always staying at the same depth for
// either APZC, and return the the first common ancestor encountered.
while (true) {
if (aApzc1 == aApzc2) {
return aApzc1;
}
if (depth1 <= 0) {
break;
}
aApzc1 = aApzc1->GetParent();
aApzc2 = aApzc2->GetParent();
}
return nullptr;
}
}
}

1
gfx/layers/composite/APZCTreeManager.h
View File

@ -257,6 +257,7 @@ private:
/* Helpers */
AsyncPanZoomController* FindTargetAPZC(AsyncPanZoomController* aApzc, const ScrollableLayerGuid& aGuid);
AsyncPanZoomController* GetAPZCAtPoint(AsyncPanZoomController* aApzc, const gfxPoint& aHitTestPoint);
AsyncPanZoomController* CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2);
/**
* Recursive helper function to build the APZC tree. The tree of APZC instances has