Bug 1700051: part 9) Change `mozInlineSpellStatus::CreateForNavigation` to return `Result<...,...>`. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D109744

extensions/spellcheck/src/mozInlineSpellChecker.cpp

@@ -214,48 +214,49 @@ mozInlineSpellStatus::CreateForEditorChange(
 //    not be processed, *aContinue will be false.
 
 // static
-nsresult mozInlineSpellStatus::CreateForNavigation(
+Result<UniquePtr<mozInlineSpellStatus>, nsresult>
-    UniquePtr<mozInlineSpellStatus>& aStatus,
+mozInlineSpellStatus::CreateForNavigation(
     mozInlineSpellChecker& aSpellChecker, bool aForceCheck,
     int32_t aNewPositionOffset, nsINode* aOldAnchorNode,
     uint32_t aOldAnchorOffset, nsINode* aNewAnchorNode,
     uint32_t aNewAnchorOffset, bool* aContinue) {
-  aStatus = MakeUnique<mozInlineSpellStatus>(&aSpellChecker);
+  UniquePtr<mozInlineSpellStatus> status =
+      MakeUnique<mozInlineSpellStatus>(&aSpellChecker);
 
-  aStatus->mOp = eOpNavigation;
+  status->mOp = eOpNavigation;
 
-  aStatus->mForceNavigationWordCheck = aForceCheck;
+  status->mForceNavigationWordCheck = aForceCheck;
-  aStatus->mNewNavigationPositionOffset = aNewPositionOffset;
+  status->mNewNavigationPositionOffset = aNewPositionOffset;
 
   // get the root node for checking
-  TextEditor* textEditor = aStatus->mSpellChecker->mTextEditor;
+  TextEditor* textEditor = status->mSpellChecker->mTextEditor;
   if (NS_WARN_IF(!textEditor)) {
-    return NS_ERROR_FAILURE;
+    return Err(NS_ERROR_FAILURE);
   }
   Element* root = textEditor->GetRoot();
   if (NS_WARN_IF(!root)) {
-    return NS_ERROR_FAILURE;
+    return Err(NS_ERROR_FAILURE);
   }
   // the anchor node might not be in the DOM anymore, check
   if (root && aOldAnchorNode &&
       !aOldAnchorNode->IsShadowIncludingInclusiveDescendantOf(root)) {
     *aContinue = false;
-    return NS_OK;
+    return status;
   }
 
-  aStatus->mOldNavigationAnchorRange =
+  status->mOldNavigationAnchorRange =
-      aStatus->PositionToCollapsedRange(aOldAnchorNode, aOldAnchorOffset);
+      status->PositionToCollapsedRange(aOldAnchorNode, aOldAnchorOffset);
-  if (NS_WARN_IF(!aStatus->mOldNavigationAnchorRange)) {
+  if (NS_WARN_IF(!status->mOldNavigationAnchorRange)) {
-    return NS_ERROR_FAILURE;
+    return Err(NS_ERROR_FAILURE);
   }
-  aStatus->mAnchorRange =
+  status->mAnchorRange =
-      aStatus->PositionToCollapsedRange(aNewAnchorNode, aNewAnchorOffset);
+      status->PositionToCollapsedRange(aNewAnchorNode, aNewAnchorOffset);
-  if (NS_WARN_IF(!aStatus->mAnchorRange)) {
+  if (NS_WARN_IF(!status->mAnchorRange)) {
-    return NS_ERROR_FAILURE;
+    return Err(NS_ERROR_FAILURE);
   }
 
   *aContinue = true;
-  return NS_OK;
+  return status;
 }
 
 // mozInlineSpellStatus::InitForSelection
@@ -1749,14 +1750,18 @@ nsresult mozInlineSpellChecker::HandleNavigationEvent(
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool shouldPost;
-  UniquePtr<mozInlineSpellStatus> status;
+  Result<UniquePtr<mozInlineSpellStatus>, nsresult> res =
-  rv = status->CreateForNavigation(
+      mozInlineSpellStatus::CreateForNavigation(
-      status, *this, aForceWordSpellCheck, aNewPositionOffset,
+          *this, aForceWordSpellCheck, aNewPositionOffset, currentAnchorNode,
-      currentAnchorNode, currentAnchorOffset, mCurrentSelectionAnchorNode,
+          currentAnchorOffset, mCurrentSelectionAnchorNode,
-      mCurrentSelectionOffset, &shouldPost);
+          mCurrentSelectionOffset, &shouldPost);
-  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (NS_WARN_IF(res.isErr())) {
+    return res.unwrapErr();
+  }
+
   if (shouldPost) {
-    rv = ScheduleSpellCheck(std::move(status));
+    rv = ScheduleSpellCheck(res.unwrap());
     NS_ENSURE_SUCCESS(rv, rv);
   }
 

extensions/spellcheck/src/mozInlineSpellChecker.h

@@ -43,12 +43,11 @@ class mozInlineSpellStatus {
                         nsINode* aStartNode, uint32_t aStartOffset,
                         nsINode* aEndNode, uint32_t aEndOffset);
 
-  static nsresult CreateForNavigation(
+  static mozilla::Result<mozilla::UniquePtr<mozInlineSpellStatus>, nsresult>
-      mozilla::UniquePtr<mozInlineSpellStatus>& aStatus,
+  CreateForNavigation(mozInlineSpellChecker& aSpellChecker, bool aForceCheck,
-      mozInlineSpellChecker& aSpellChecker, bool aForceCheck,
+                      int32_t aNewPositionOffset, nsINode* aOldAnchorNode,
-      int32_t aNewPositionOffset, nsINode* aOldAnchorNode,
+                      uint32_t aOldAnchorOffset, nsINode* aNewAnchorNode,
-      uint32_t aOldAnchorOffset, nsINode* aNewAnchorNode,
+                      uint32_t aNewAnchorOffset, bool* aContinue);
-      uint32_t aNewAnchorOffset, bool* aContinue);
   nsresult InitForSelection();
   nsresult InitForRange(nsRange* aRange);