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

Bug 1678505 - Make APZEventResult::mStatus and mHandledResult private. r=botond

Browse Source 
We do want APZEventResult to have a valid mHandledResult in the case of
nsEventStatus_eConsumeDoDefault.

Note that when we call SetStatusAsConsumeDoDefault() with a InputBlockState,
in ReceiveScrollWheelInput() for example, we need to keep the block alive there,
so each block is now RefPtr-ed instead of a raw pointer in such functions (the
raw pointer is sometimes the active one (mActiveWheelBlock etc.) which will be
discarded in ProcessQueue()).

Differential Revision: https://phabricator.services.mozilla.com/D103417
This commit is contained in:
Hiroyuki Ikezoe
2021-03-02 08:06:27 +00:00
parent 0f6002797b
commit 367ef9ceec
18 changed files with 267 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
widget/android/nsWindow.cpp
View File

@@ -392,7 +392,7 @@ class NPZCSupport final
WheelDeltaAdjustmentStrategy::eNone);
APZEventResult result = controller->InputBridge()->ReceiveInputEvent(input);
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
if (result.GetStatus() == nsEventStatus_eConsumeNoDefault) {
return INPUT_RESULT_IGNORED;
}
@@ -401,11 +401,12 @@ class NPZCSupport final
window->ProcessUntransformedAPZEvent(&wheelEvent, result);
});
switch (result.mStatus) {
switch (result.GetStatus()) {
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return (result.mHandledResult == Some(APZHandledResult::HandledByRoot))
return (result.GetHandledResult() ==
Some(APZHandledResult::HandledByRoot))
? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
default:
@@ -532,7 +533,7 @@ class NPZCSupport final
nsWindow::GetEventTimeStamp(aTime), nsWindow::GetModifiers(aMetaState));
APZEventResult result = controller->InputBridge()->ReceiveInputEvent(input);
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
if (result.GetStatus() == nsEventStatus_eConsumeNoDefault) {
return INPUT_RESULT_IGNORED;
}
@@ -541,11 +542,12 @@ class NPZCSupport final
window->ProcessUntransformedAPZEvent(&mouseEvent, result);
});
switch (result.mStatus) {
switch (result.GetStatus()) {
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return (result.mHandledResult == Some(APZHandledResult::HandledByRoot))
return (result.GetHandledResult() ==
Some(APZHandledResult::HandledByRoot))
? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
default:
@@ -791,7 +793,7 @@ class NPZCSupport final
APZEventResult result =
controller->InputBridge()->ReceiveInputEvent(aInput);
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
if (result.GetStatus() == nsEventStatus_eConsumeNoDefault) {
if (aReturnResult) {
aReturnResult->Complete(
java::sdk::Integer::ValueOf(INPUT_RESULT_IGNORED));
@@ -811,17 +813,17 @@ class NPZCSupport final
return;
}
if (result.mHandledResult != Nothing()) {
if (result.GetHandledResult() != Nothing()) {
// We know conclusively that the root APZ handled this or not and
// don't need to do any more work.
switch (result.mStatus) {
switch (result.GetStatus()) {
case nsEventStatus_eIgnore:
aReturnResult->Complete(
java::sdk::Integer::ValueOf(INPUT_RESULT_UNHANDLED));
break;
case nsEventStatus_eConsumeDoDefault:
aReturnResult->Complete(java::sdk::Integer::ValueOf(
ConvertAPZHandledResult(result.mHandledResult.value())));
ConvertAPZHandledResult(result.GetHandledResult().value())));
break;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected nsEventStatus");