зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1738152 - Remove the aOutSourceOfOverscrollTransform parameter of APZCTreeManager::ComputeTransformForNode(). r=hiro
This parameter was only used by InternalHitTester. Differential Revision: https://phabricator.services.mozilla.com/D129763
This commit is contained in:
Родитель
c2ac235ed4
Коммит
441e0d7e8c
|
@ -3348,8 +3348,7 @@ SideBits APZCTreeManager::SidesStuckToRootContent(
|
||||||
}
|
}
|
||||||
|
|
||||||
LayerToParentLayerMatrix4x4 APZCTreeManager::ComputeTransformForNode(
|
LayerToParentLayerMatrix4x4 APZCTreeManager::ComputeTransformForNode(
|
||||||
const HitTestingTreeNode* aNode,
|
const HitTestingTreeNode* aNode) const {
|
||||||
const AsyncPanZoomController** aOutSourceOfOverscrollTransform) const {
|
|
||||||
mTreeLock.AssertCurrentThreadIn();
|
mTreeLock.AssertCurrentThreadIn();
|
||||||
// The async transforms applied here for hit-testing purposes, are intended
|
// The async transforms applied here for hit-testing purposes, are intended
|
||||||
// to match the ones AsyncCompositionManager (or equivalent WebRender code)
|
// to match the ones AsyncCompositionManager (or equivalent WebRender code)
|
||||||
|
@ -3386,19 +3385,12 @@ LayerToParentLayerMatrix4x4 APZCTreeManager::ComputeTransformForNode(
|
||||||
visualTransformIsInheritedFromAncestor
|
visualTransformIsInheritedFromAncestor
|
||||||
? AsyncTransformComponents{AsyncTransformComponent::eLayout}
|
? AsyncTransformComponents{AsyncTransformComponent::eLayout}
|
||||||
: LayoutAndVisual;
|
: LayoutAndVisual;
|
||||||
if (aOutSourceOfOverscrollTransform &&
|
|
||||||
components.contains(AsyncTransformComponent::eVisual)) {
|
|
||||||
*aOutSourceOfOverscrollTransform = apzc;
|
|
||||||
}
|
|
||||||
return aNode->GetTransform() *
|
return aNode->GetTransform() *
|
||||||
CompleteAsyncTransform(apzc->GetCurrentAsyncTransformWithOverscroll(
|
CompleteAsyncTransform(apzc->GetCurrentAsyncTransformWithOverscroll(
|
||||||
AsyncPanZoomController::eForHitTesting, components));
|
AsyncPanZoomController::eForHitTesting, components));
|
||||||
} else if (aNode->GetAsyncZoomContainerId()) {
|
} else if (aNode->GetAsyncZoomContainerId()) {
|
||||||
if (AsyncPanZoomController* rootContent =
|
if (AsyncPanZoomController* rootContent =
|
||||||
FindRootContentApzcForLayersId(aNode->GetLayersId())) {
|
FindRootContentApzcForLayersId(aNode->GetLayersId())) {
|
||||||
if (aOutSourceOfOverscrollTransform) {
|
|
||||||
*aOutSourceOfOverscrollTransform = rootContent;
|
|
||||||
}
|
|
||||||
return aNode->GetTransform() *
|
return aNode->GetTransform() *
|
||||||
CompleteAsyncTransform(
|
CompleteAsyncTransform(
|
||||||
rootContent->GetCurrentAsyncTransformWithOverscroll(
|
rootContent->GetCurrentAsyncTransformWithOverscroll(
|
||||||
|
|
|
@ -693,14 +693,9 @@ class APZCTreeManager : public IAPZCTreeManager, public APZInputBridge {
|
||||||
|
|
||||||
// Returns the transform that converts from |aNode|'s coordinates to
|
// Returns the transform that converts from |aNode|'s coordinates to
|
||||||
// the coordinates of |aNode|'s parent in the hit-testing tree.
|
// the coordinates of |aNode|'s parent in the hit-testing tree.
|
||||||
// If the returned transform includes an overscroll transform,
|
|
||||||
// |aOutSourceOfOverscrollTransform| (if not nullptr) is populated
|
|
||||||
// with the APZC which is the source of that overscroll transform.
|
|
||||||
// Requires the caller to hold mTreeLock.
|
// Requires the caller to hold mTreeLock.
|
||||||
LayerToParentLayerMatrix4x4 ComputeTransformForNode(
|
LayerToParentLayerMatrix4x4 ComputeTransformForNode(
|
||||||
const HitTestingTreeNode* aNode,
|
const HitTestingTreeNode* aNode) const;
|
||||||
const AsyncPanZoomController** aOutSourceOfOverscrollTransform =
|
|
||||||
nullptr) const;
|
|
||||||
|
|
||||||
// Look up the GeckoContentController for the given layers id.
|
// Look up the GeckoContentController for the given layers id.
|
||||||
static already_AddRefed<GeckoContentController> GetContentController(
|
static already_AddRefed<GeckoContentController> GetContentController(
|
||||||
|
|
Загрузка…
Ссылка в новой задаче