Bug 1366365 - Rename APZCTreeManager::FindScrollNode() to FindScrollThumbNode() for clarity. r=kats
MozReview-Commit-ID: FnseNzwnx3g
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -1803,17 +1803,17 @@ APZCTreeManager::BuildOverscrollHandoffC
void
APZCTreeManager::SetLongTapEnabled(bool aLongTapEnabled)
{
APZThreadUtils::RunOnControllerThread(
NewRunnableFunction(GestureEventListener::SetLongTapEnabled, aLongTapEnabled));
}
RefPtr<HitTestingTreeNode>
-APZCTreeManager::FindScrollNode(const AsyncDragMetrics& aDragMetrics)
+APZCTreeManager::FindScrollThumbNode(const AsyncDragMetrics& aDragMetrics)
{
MutexAutoLock lock(mTreeLock);
return DepthFirstSearch<ReverseIterator>(mRootNode.get(),
[&aDragMetrics](HitTestingTreeNode* aNode) {
return aNode->MatchesScrollDragMetrics(aDragMetrics);
});
}
--- a/gfx/layers/apz/src/APZCTreeManager.h
+++ b/gfx/layers/apz/src/APZCTreeManager.h
@@ -290,17 +290,17 @@ public:
* Returns the current dpi value in use.
*/
static float GetDPI() { return sDPI; }
/**
* Find the hit testing node for the scrollbar thumb that matches these
* drag metrics.
*/
- RefPtr<HitTestingTreeNode> FindScrollNode(const AsyncDragMetrics& aDragMetrics);
+ RefPtr<HitTestingTreeNode> FindScrollThumbNode(const AsyncDragMetrics& aDragMetrics);
/**
* Sets allowed touch behavior values for current touch-session for specific
* input block (determined by aInputBlock).
* Should be invoked by the widget. Each value of the aValues arrays
* corresponds to the different touch point that is currently active.
* Must be called after receiving the TOUCH_START event that starts the
* touch-session.
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -901,17 +901,17 @@ nsEventStatus AsyncPanZoomController::Ha
ScrollSnap();
}
if (aEvent.mType != MouseInput::MouseType::MOUSE_MOVE) {
return nsEventStatus_eConsumeNoDefault;
}
RefPtr<HitTestingTreeNode> node =
- GetApzcTreeManager()->FindScrollNode(aDragMetrics);
+ GetApzcTreeManager()->FindScrollThumbNode(aDragMetrics);
if (!node) {
return nsEventStatus_eConsumeNoDefault;
}
const ScrollThumbData& thumbData = node->GetScrollThumbData();
mozilla::Telemetry::Accumulate(mozilla::Telemetry::SCROLL_INPUT_METHODS,
(uint32_t) ScrollInputMethod::ApzScrollbarDrag);