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 965381 - Delay the single tap notification until after the touchdown is handled. r=daleharvey

Browse Source
This commit is contained in:
Kartikaya Gupta 2014-02-10 17:34:24 -05:00
parent aa24ebde03
commit 4666e09d4c
2 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/ipc/AsyncPanZoomController.cpp
View File

@ -963,7 +963,15 @@ nsEventStatus AsyncPanZoomController::OnSingleTapUp(const TapGestureInput& aEven
int32_t modifiers = WidgetModifiersToDOMModifiers(aEvent.modifiers);
CSSIntPoint geckoScreenPoint;
if (ConvertToGecko(aEvent.mPoint, &geckoScreenPoint)) {
controller->HandleSingleTap(geckoScreenPoint, modifiers, GetGuid());
// Because this may be being running as part of APZCTreeManager::ReceiveInputEvent,
// calling controller->HandleSingleTap directly might mean that content receives
// the single tap message before the corresponding touch-up. To avoid that we
// schedule the singletap message to run on the next spin of the event loop.
// See bug 965381 for the issue this was causing.
controller->PostDelayedTask(
NewRunnableMethod(controller.get(), &GeckoContentController::HandleSingleTap,
geckoScreenPoint, modifiers, GetGuid()),
0);
return nsEventStatus_eConsumeNoDefault;
}
}
@ -977,7 +985,11 @@ nsEventStatus AsyncPanZoomController::OnSingleTapConfirmed(const TapGestureInput
int32_t modifiers = WidgetModifiersToDOMModifiers(aEvent.modifiers);
CSSIntPoint geckoScreenPoint;
if (ConvertToGecko(aEvent.mPoint, &geckoScreenPoint)) {
controller->HandleSingleTap(geckoScreenPoint, modifiers, GetGuid());
// See comment in OnSingleTapUp as to why we do this in PostDelayedTask.
controller->PostDelayedTask(
NewRunnableMethod(controller.get(), &GeckoContentController::HandleSingleTap,
geckoScreenPoint, modifiers, GetGuid()),
0);
return nsEventStatus_eConsumeNoDefault;
}
}

47
gfx/tests/gtest/TestAsyncPanZoomController.cpp
View File

@ -43,11 +43,26 @@ class MockContentControllerDelayed : public MockContentController {
public:
void PostDelayedTask(Task* aTask, int aDelayMs) {
// Ensure we're not clobbering an existing task
EXPECT_TRUE(nullptr == mCurrentTask);
mCurrentTask = aTask;
}
Task* GetDelayedTask() {
return mCurrentTask;
void CheckHasDelayedTask() {
EXPECT_TRUE(nullptr != mCurrentTask);
}
// Note that deleting mCurrentTask is important in order to
// release the reference to the callee object. Without this
// that object might be leaked. This is also why we don't
// expose mCurrentTask to any users of MockContentControllerDelayed.
void RunDelayedTask() {
// Running mCurrentTask may call PostDelayedTask, so we should
// keep a local copy of mCurrentTask and operate on that
Task* local = mCurrentTask;
mCurrentTask = nullptr;
local->Run();
delete local;
}
private:
@ -587,7 +602,7 @@ TEST(AsyncPanZoomController, OverScrollPanning) {
}
TEST(AsyncPanZoomController, ShortPress) {
nsRefPtr<MockContentController> mcc = new NiceMock<MockContentController>();
nsRefPtr<MockContentControllerDelayed> mcc = new NiceMock<MockContentControllerDelayed>();
nsRefPtr<TestAPZCTreeManager> tm = new TestAPZCTreeManager();
nsRefPtr<TestAsyncPanZoomController> apzc = new TestAsyncPanZoomController(
0, mcc, tm, AsyncPanZoomController::USE_GESTURE_DETECTOR);
@ -596,17 +611,22 @@ TEST(AsyncPanZoomController, ShortPress) {
apzc->NotifyLayersUpdated(TestFrameMetrics(), true);
apzc->UpdateZoomConstraints(ZoomConstraints(false, CSSToScreenScale(1.0), CSSToScreenScale(1.0)));
EXPECT_CALL(*mcc, HandleSingleTap(CSSIntPoint(10, 10), 0, apzc->GetGuid())).Times(1);
int time = 0;
nsEventStatus status = ApzcTap(apzc, 10, 10, time, 100);
EXPECT_EQ(nsEventStatus_eIgnore, status);
// This verifies that the single tap notification is sent after the
// touchdown is fully processed. The ordering here is important.
mcc->CheckHasDelayedTask();
EXPECT_CALL(*mcc, HandleSingleTap(CSSIntPoint(10, 10), 0, apzc->GetGuid())).Times(1);
mcc->RunDelayedTask();
apzc->Destroy();
}
TEST(AsyncPanZoomController, MediumPress) {
nsRefPtr<MockContentController> mcc = new NiceMock<MockContentController>();
nsRefPtr<MockContentControllerDelayed> mcc = new NiceMock<MockContentControllerDelayed>();
nsRefPtr<TestAPZCTreeManager> tm = new TestAPZCTreeManager();
nsRefPtr<TestAsyncPanZoomController> apzc = new TestAsyncPanZoomController(
0, mcc, tm, AsyncPanZoomController::USE_GESTURE_DETECTOR);
@ -615,12 +635,17 @@ TEST(AsyncPanZoomController, MediumPress) {
apzc->NotifyLayersUpdated(TestFrameMetrics(), true);
apzc->UpdateZoomConstraints(ZoomConstraints(false, CSSToScreenScale(1.0), CSSToScreenScale(1.0)));
EXPECT_CALL(*mcc, HandleSingleTap(CSSIntPoint(10, 10), 0, apzc->GetGuid())).Times(1);
int time = 0;
nsEventStatus status = ApzcTap(apzc, 10, 10, time, 400);
EXPECT_EQ(nsEventStatus_eIgnore, status);
// This verifies that the single tap notification is sent after the
// touchdown is fully processed. The ordering here is important.
mcc->CheckHasDelayedTask();
EXPECT_CALL(*mcc, HandleSingleTap(CSSIntPoint(10, 10), 0, apzc->GetGuid())).Times(1);
mcc->RunDelayedTask();
apzc->Destroy();
}
@ -639,13 +664,11 @@ TEST(AsyncPanZoomController, LongPress) {
nsEventStatus status = ApzcDown(apzc, 10, 10, time);
EXPECT_EQ(nsEventStatus_eConsumeNoDefault, status);
Task* t = mcc->GetDelayedTask();
EXPECT_TRUE(nullptr != t);
mcc->CheckHasDelayedTask();
EXPECT_CALL(*mcc, HandleLongTap(CSSIntPoint(10, 10), 0, apzc->GetGuid())).Times(1);
// Manually invoke the longpress while the touch is currently down.
t->Run();
mcc->RunDelayedTask();
time += 1000;