Bug 1611415 - Prefer using std::move over forget. r=froydnj

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

--HG--
extra : moz-landing-system : lando

Author: sigiesec

accessible/base/nsAccessiblePivot.cpp

@@ -398,7 +398,7 @@ bool nsAccessiblePivot::IsDescendantOf(Accessible* aAccessible,
 bool nsAccessiblePivot::MovePivotInternal(Accessible* aPosition,
                                           PivotMoveReason aReason,
                                           bool aIsFromUserInput) {
-  RefPtr<Accessible> oldPosition = mPosition.forget();
+  RefPtr<Accessible> oldPosition = std::move(mPosition);
   mPosition = aPosition;
   int32_t oldStart = mStartOffset, oldEnd = mEndOffset;
   mStartOffset = mEndOffset = -1;

docshell/base/BrowsingContext.cpp

@@ -1562,7 +1562,7 @@ bool IPDLParamTraits<dom::BrowsingContext*>::Read(
     browsingContext.get()->Release();
   }
 
-  *aResult = browsingContext.forget();
+  *aResult = std::move(browsingContext);
   return true;
 }
 

docshell/base/CanonicalBrowsingContext.cpp

@@ -490,7 +490,7 @@ CanonicalBrowsingContext::ChangeFrameRemoteness(const nsAString& aRemoteType,
             change->Complete(aContentParent);
           },
           [change](nsresult aRv) { change->Cancel(aRv); });
-  return promise.forget();
+  return promise;
 }
 
 already_AddRefed<Promise> CanonicalBrowsingContext::ChangeFrameRemoteness(

docshell/base/WindowContext.cpp

@@ -214,7 +214,7 @@ bool IPDLParamTraits<dom::WindowContext*>::Read(
     windowContext.get()->Release();
   }
 
-  *aResult = windowContext.forget();
+  *aResult = std::move(windowContext);
   return true;
 }
 

docshell/base/nsDefaultURIFixup.cpp

@@ -428,7 +428,7 @@ nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
     }
 
     nsCOMPtr<nsIURI> temp = DeserializeURI(uri);
-    info->mPreferredURI = temp.forget();
+    info->mPreferredURI = std::move(temp);
     return NS_OK;
   }
 

docshell/base/nsDocShellEditorData.cpp

@@ -26,7 +26,7 @@ nsDocShellEditorData::~nsDocShellEditorData() { TearDownEditor(); }
 
 void nsDocShellEditorData::TearDownEditor() {
   if (mHTMLEditor) {
-    RefPtr<HTMLEditor> htmlEditor = mHTMLEditor.forget();
+    RefPtr<HTMLEditor> htmlEditor = std::move(mHTMLEditor);
     htmlEditor->PreDestroy(false);
   }
   mEditingSession = nullptr;
@@ -43,7 +43,7 @@ nsresult nsDocShellEditorData::MakeEditable(bool aInWaitForUriLoad) {
   if (mHTMLEditor) {
     NS_WARNING("Destroying existing editor on frame");
 
-    RefPtr<HTMLEditor> htmlEditor = mHTMLEditor.forget();
+    RefPtr<HTMLEditor> htmlEditor = std::move(mHTMLEditor);
     htmlEditor->PreDestroy(false);
   }
 
@@ -72,7 +72,7 @@ nsresult nsDocShellEditorData::SetHTMLEditor(HTMLEditor* aHTMLEditor) {
   }
 
   if (mHTMLEditor) {
-    RefPtr<HTMLEditor> htmlEditor = mHTMLEditor.forget();
+    RefPtr<HTMLEditor> htmlEditor = std::move(mHTMLEditor);
     htmlEditor->PreDestroy(false);
     MOZ_ASSERT(!mHTMLEditor,
                "Nested call of nsDocShellEditorData::SetHTMLEditor() detected");

docshell/shistory/MaybeNewPSHEntry.cpp

@@ -88,7 +88,7 @@ bool IPDLParamTraits<dom::CrossProcessSHEntry*>::Read(
             newEntry.mSharedID);
         dom::ContentChild::GetSingleton()->BindPSHEntryEndpoint(
             std::move(newEntry.mEndpoint), do_AddRef(entry).take());
-        *aEntry = entry.forget();
+        *aEntry = std::move(entry);
         return true;
       });
 }

docshell/shistory/SHistoryParent.cpp

@@ -232,7 +232,7 @@ bool SHistoryParent::RecvFindEntryForBFCache(
         *aEntry = nullptr;
         *aIndex = -1;
       } else {
-        *aEntry = shEntry.forget();
+        *aEntry = std::move(shEntry);
         *aIndex = i;
       }
 

docshell/shistory/nsSHistory.cpp

@@ -1580,7 +1580,7 @@ nsresult nsSHistory::InitiateLoad(nsISHEntry* aFrameEntry,
   nsCOMPtr<nsIContentSecurityPolicy> csp = aFrameEntry->GetCsp();
   loadState->SetCsp(csp);
 
-  aLoadResult.mLoadState = loadState.forget();
+  aLoadResult.mLoadState = std::move(loadState);
 
   return NS_OK;
 }

dom/animation/Animation.cpp

@@ -1727,7 +1727,7 @@ void Animation::DoFinishNotification(SyncNotifyFlag aSyncNotifyFlag) {
   } else if (!mFinishNotificationTask) {
     RefPtr<MicroTaskRunnable> runnable = new AsyncFinishNotification(this);
     context->DispatchToMicroTask(do_AddRef(runnable));
-    mFinishNotificationTask = runnable.forget();
+    mFinishNotificationTask = std::move(runnable);
   }
 }