mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1631754 - Improve code to distinguish between root and content handling of events. r=snorp,geckoview-reviewers 

In particular, the eConsumeNoDefault case also needs to check for mTargetIsRoot
and the apz aware listeners flag.

Differential Revision: https://phabricator.services.mozilla.com/D75301
This commit is contained in:
Kartikaya Gupta 2020-05-14 13:51:34 +00:00
Родитель 852f914bb7
Коммит a8c2fc579a
1 изменённых файлов: 18 добавлений и 21 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

39
widget/android/nsWindow.cpp
Просмотреть файл

@ -521,9 +521,13 @@ class nsWindow::NPZCSupport final
WheelDeltaAdjustmentStrategy::eNone);
APZEventResult result = controller->InputBridge()->ReceiveInputEvent(input);
int32_t ret =
!result.mTargetIsRoot || result.mHitRegionWithApzAwareListeners
? INPUT_RESULT_HANDLED_CONTENT
: INPUT_RESULT_HANDLED;
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
return INPUT_RESULT_HANDLED;
return ret;
}
PostInputEvent([input, result](nsWindow* window) {
@ -531,16 +535,11 @@ class nsWindow::NPZCSupport final
window->ProcessUntransformedAPZEvent(&wheelEvent, result);
});
if (result.mHitRegionWithApzAwareListeners) {
return INPUT_RESULT_HANDLED_CONTENT;
}
switch (result.mStatus) {
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return result.mTargetIsRoot ? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
return ret;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected nsEventStatus");
return INPUT_RESULT_UNHANDLED;
@ -646,9 +645,13 @@ class nsWindow::NPZCSupport final
GetEventTimeStamp(aTime), GetModifiers(aMetaState));
APZEventResult result = controller->InputBridge()->ReceiveInputEvent(input);
int32_t ret =
!result.mTargetIsRoot || result.mHitRegionWithApzAwareListeners
? INPUT_RESULT_HANDLED_CONTENT
: INPUT_RESULT_HANDLED;
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
return INPUT_RESULT_HANDLED;
return ret;
}
PostInputEvent([input, result](nsWindow* window) {
@ -656,16 +659,11 @@ class nsWindow::NPZCSupport final
window->ProcessUntransformedAPZEvent(&mouseEvent, result);
});
if (result.mHitRegionWithApzAwareListeners) {
return INPUT_RESULT_HANDLED_CONTENT;
}
switch (result.mStatus) {
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return result.mTargetIsRoot ? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
return ret;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected nsEventStatus");
return INPUT_RESULT_UNHANDLED;
@ -774,9 +772,13 @@ class nsWindow::NPZCSupport final
}
APZEventResult result = controller->InputBridge()->ReceiveInputEvent(input);
int32_t ret =
!result.mTargetIsRoot || result.mHitRegionWithApzAwareListeners
? INPUT_RESULT_HANDLED_CONTENT
: INPUT_RESULT_HANDLED;
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
return INPUT_RESULT_HANDLED;
return ret;
}
// Dispatch APZ input event on Gecko thread.
@ -786,16 +788,11 @@ class nsWindow::NPZCSupport final
window->DispatchHitTest(touchEvent);
});
if (result.mHitRegionWithApzAwareListeners) {
return INPUT_RESULT_HANDLED_CONTENT;
}
switch (result.mStatus) {
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return result.mTargetIsRoot ? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
return ret;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected nsEventStatus");
return INPUT_RESULT_UNHANDLED;