Bug 1404854 Part 2 - Move adding mOffsetYToCaretLogicalPosition into DragCaretInternal().
MozReview-Commit-ID: 1hKB7V4JSZo
--- a/layout/base/AccessibleCaretManager.cpp
+++ b/layout/base/AccessibleCaretManager.cpp
@@ -505,18 +505,17 @@ AccessibleCaretManager::DragCaret(const
{
MOZ_ASSERT(mActiveCaret);
MOZ_ASSERT(GetCaretMode() != CaretMode::None);
if (!mPresShell || !mPresShell->GetRootFrame() || !GetSelection()) {
return NS_ERROR_NULL_POINTER;
}
- nsPoint point(aPoint.x, aPoint.y + mOffsetYToCaretLogicalPosition);
- DragCaretInternal(point);
+ DragCaretInternal(aPoint);
UpdateCarets();
return NS_OK;
}
nsresult
AccessibleCaretManager::ReleaseCaret()
{
MOZ_ASSERT(mActiveCaret);
@@ -1214,17 +1213,18 @@ AccessibleCaretManager::CompareTreePosit
nsresult
AccessibleCaretManager::DragCaretInternal(const nsPoint& aPoint)
{
MOZ_ASSERT(mPresShell);
nsIFrame* rootFrame = mPresShell->GetRootFrame();
MOZ_ASSERT(rootFrame, "We need root frame to compute caret dragging!");
- nsPoint point = AdjustDragBoundary(aPoint);
+ nsPoint point = AdjustDragBoundary(
+ nsPoint(aPoint.x, aPoint.y + mOffsetYToCaretLogicalPosition));
// Find out which content we point to
nsIFrame* ptFrame = nsLayoutUtils::GetFrameForPoint(
rootFrame, point,
nsLayoutUtils::IGNORE_PAINT_SUPPRESSION | nsLayoutUtils::IGNORE_CROSS_DOC);
if (!ptFrame) {
return NS_ERROR_FAILURE;
}