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

Bug 1678505 - Add overscroll-behavior and scrollable directions into APZHandledResult. r=botond

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D103419
This commit is contained in:
Hiroyuki Ikezoe
2021-03-02 08:06:28 +00:00
parent bebf4afb9d
commit 9f727bae2a
12 changed files with 638 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
widget/android/nsWindow.cpp
View File

@@ -405,8 +405,7 @@ class NPZCSupport final
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return (result.GetHandledResult() ==
Some(APZHandledResult::HandledByRoot))
return result.GetHandledResult()->IsHandledByRoot()
? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
default:
@@ -459,14 +458,14 @@ class NPZCSupport final
}
static int32_t ConvertAPZHandledResult(APZHandledResult aHandledResult) {
switch (aHandledResult) {
case APZHandledResult::Unhandled:
switch (aHandledResult.mPlace) {
case APZHandledPlace::Unhandled:
return INPUT_RESULT_UNHANDLED;
case APZHandledResult::HandledByRoot:
case APZHandledPlace::HandledByRoot:
return INPUT_RESULT_HANDLED;
case APZHandledResult::HandledByContent:
case APZHandledPlace::HandledByContent:
return INPUT_RESULT_HANDLED_CONTENT;
case APZHandledResult::Invalid:
case APZHandledPlace::Invalid:
MOZ_ASSERT_UNREACHABLE("The handled result should NOT be Invalid");
return INPUT_RESULT_UNHANDLED;
}
@@ -546,8 +545,7 @@ class NPZCSupport final
case nsEventStatus_eIgnore:
return INPUT_RESULT_UNHANDLED;
case nsEventStatus_eConsumeDoDefault:
return (result.GetHandledResult() ==
Some(APZHandledResult::HandledByRoot))
return result.GetHandledResult()->IsHandledByRoot()
? INPUT_RESULT_HANDLED
: INPUT_RESULT_HANDLED_CONTENT;
default: