Bug 1404854 Part 2 - Move adding mOffsetYToCaretLogicalPosition into DragCaretInternal(). draft
authorTing-Yu Lin <tlin@mozilla.com>
Fri, 06 Oct 2017 17:39:56 +0800
changeset 676579 d02fb91e9835b11bfda7034aaad26772a95a122e
parent 676578 bac344b8cda981bf54f326c86c9f53d1e8847af4
child 676580 47a4d919843c2960902529d17a8e3c4386bc92a4
push id83535
push userbmo:tlin@mozilla.com
push dateMon, 09 Oct 2017 02:19:24 +0000
bugs1404854
milestone58.0a1
Bug 1404854 Part 2 - Move adding mOffsetYToCaretLogicalPosition into DragCaretInternal(). MozReview-Commit-ID: 1hKB7V4JSZo
layout/base/AccessibleCaretManager.cpp
--- 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;
   }