Bug 1465585: Switch from mozilla::Move to std::move. r=froydnj

This was done automatically replacing:

  s/mozilla::Move/std::move/
  s/ Move(/ std::move(/
  s/(Move(/(std::move(/

Removing the 'using mozilla::Move;' lines.

And then with a few manual fixups, see the bug for the split series..

MozReview-Commit-ID: Jxze3adipUh

Author: emilio

accessible/base/EventTree.cpp

@@ -178,7 +178,7 @@ EventTree::Process(const RefPtr<DocAccessible>& aDeathGrip)
         return;
       }
     }
-    mFirst = Move(mFirst->mNext);
+    mFirst = std::move(mFirst->mNext);
   }
 
   MOZ_ASSERT(mContainer || mDependentEvents.IsEmpty(),
@@ -329,9 +329,9 @@ EventTree::FindOrInsert(Accessible* aContainer)
       node->mFireReorder = false;
       UniquePtr<EventTree>& nodeOwnerRef = prevNode ? prevNode->mNext : mFirst;
       UniquePtr<EventTree> newNode(new EventTree(aContainer, mDependentEvents.IsEmpty()));
-      newNode->mFirst = Move(nodeOwnerRef);
-      nodeOwnerRef = Move(newNode);
-      nodeOwnerRef->mNext = Move(node->mNext);
+      newNode->mFirst = std::move(nodeOwnerRef);
+      nodeOwnerRef = std::move(newNode);
+      nodeOwnerRef->mNext = std::move(node->mNext);
 
       // Check if a next node is contained by the given node too, and move them
       // under the given node if so.
@@ -350,10 +350,10 @@ EventTree::FindOrInsert(Accessible* aContainer)
           MOZ_ASSERT(!insNode->mNext);
 
           node->mFireReorder = false;
-          insNode->mNext = Move(*nodeRef);
+          insNode->mNext = std::move(*nodeRef);
           insNode = insNode->mNext.get();
 
-          prevNode->mNext = Move(node->mNext);
+          prevNode->mNext = std::move(node->mNext);
           node = prevNode;
           break;
         }
@@ -508,7 +508,7 @@ EventTree::Mutated(AccMutationEvent* aEv)
                 AccShowEvent* childShowEv = downcast_accEvent(childEv);
                 if (childShowEv->mPrecedingEvents.Length() > 0) {
                   Controller(mContainer)->StorePrecedingEvents(
-                    mozilla::Move(childShowEv->mPrecedingEvents));
+                    std::move(childShowEv->mPrecedingEvents));
                 }
               }
             }
@@ -540,7 +540,7 @@ EventTree::Mutated(AccMutationEvent* aEv)
           }
         }
 
-        *node = Move((*node)->mNext);
+        *node = std::move((*node)->mNext);
         break;
       }
       cntr = cntr->Parent();

accessible/base/NotificationController.cpp

@@ -792,7 +792,7 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
       Accessible* outerDocAcc = mDocument->GetAccessible(ownerContent);
       if (outerDocAcc && outerDocAcc->AppendChild(childDoc)) {
         if (mDocument->AppendChildDocument(childDoc)) {
-          newChildDocs.AppendElement(Move(mHangingChildDocuments[idx]));
+          newChildDocs.AppendElement(std::move(mHangingChildDocuments[idx]));
           continue;
         }
 
@@ -864,7 +864,7 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
   mEventGeneration = 0;
 
   // Now that we are done with them get rid of the events we fired.
-  RefPtr<AccTreeMutationEvent> mutEvent = Move(mFirstMutationEvent);
+  RefPtr<AccTreeMutationEvent> mutEvent = std::move(mFirstMutationEvent);
   mLastMutationEvent = nullptr;
   mFirstMutationEvent = nullptr;
   while (mutEvent) {

accessible/base/NotificationController.h

@@ -294,7 +294,7 @@ class NotificationController final : public EventQueue,
   void WithdrawPrecedingEvents(nsTArray<RefPtr<AccHideEvent>>* aEvs)
   {
     if (mPrecedingEvents.Length() > 0) {
-      aEvs->AppendElements(mozilla::Move(mPrecedingEvents));
+      aEvs->AppendElements(std::move(mPrecedingEvents));
     }
   }
   void StorePrecedingEvent(AccHideEvent* aEv)

accessible/base/Relation.h

@@ -35,14 +35,14 @@ class Relation
     { AppendTarget(aDocument, aContent); }
 
   Relation(Relation&& aOther) :
-    mFirstIter(Move(aOther.mFirstIter)), mLastIter(aOther.mLastIter)
+    mFirstIter(std::move(aOther.mFirstIter)), mLastIter(aOther.mLastIter)
   {
     aOther.mLastIter = nullptr;
   }
 
   Relation& operator = (Relation&& aRH)
   {
-    mFirstIter = Move(aRH.mFirstIter);
+    mFirstIter = std::move(aRH.mFirstIter);
     mLastIter = aRH.mLastIter;
     aRH.mLastIter = nullptr;
     return *this;

accessible/base/TextRange.h

@@ -49,16 +49,16 @@ class TextRange final
             HyperTextAccessible* aEndContainer, int32_t aEndOffset);
   TextRange() : mStartOffset{0}, mEndOffset{0} {}
   TextRange(TextRange&& aRange) :
-    mRoot(mozilla::Move(aRange.mRoot)),
-    mStartContainer(mozilla::Move(aRange.mStartContainer)),
-    mEndContainer(mozilla::Move(aRange.mEndContainer)),
+    mRoot(std::move(aRange.mRoot)),
+    mStartContainer(std::move(aRange.mStartContainer)),
+    mEndContainer(std::move(aRange.mEndContainer)),
     mStartOffset(aRange.mStartOffset), mEndOffset(aRange.mEndOffset) {}
 
   TextRange& operator= (TextRange&& aRange)
   {
-    mRoot = mozilla::Move(aRange.mRoot);
-    mStartContainer = mozilla::Move(aRange.mStartContainer);
-    mEndContainer = mozilla::Move(aRange.mEndContainer);
+    mRoot = std::move(aRange.mRoot);
+    mStartContainer = std::move(aRange.mStartContainer);
+    mEndContainer = std::move(aRange.mEndContainer);
     mStartOffset = aRange.mStartOffset;
     mEndOffset = aRange.mEndOffset;
     return *this;

accessible/generic/HyperTextAccessible.cpp

@@ -1807,7 +1807,7 @@ HyperTextAccessible::SelectionRanges(nsTArray<a11y::TextRange>* aRanges) const
 
     TextRange tr(IsTextField() ? const_cast<HyperTextAccessible*>(this) : mDoc,
                     startContainer, startOffset, endContainer, endOffset);
-    *(aRanges->AppendElement()) = Move(tr);
+    *(aRanges->AppendElement()) = std::move(tr);
   }
 }
 

accessible/ipc/DocAccessibleParent.cpp

@@ -97,7 +97,7 @@ DocAccessibleParent::RecvShowEvent(const ShowEventData& aData,
   nsINode* node = nullptr;
   RefPtr<xpcAccEvent> event = new xpcAccEvent(type, xpcAcc, doc, node,
                                               aFromUser);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }
@@ -196,7 +196,7 @@ DocAccessibleParent::RecvHideEvent(const uint64_t& aRootID,
   MOZ_ASSERT(CheckDocTree());
 
   if (event) {
-    nsCoreUtils::DispatchAccEvent(Move(event));
+    nsCoreUtils::DispatchAccEvent(std::move(event));
   }
 
   return IPC_OK();
@@ -227,7 +227,7 @@ DocAccessibleParent::RecvEvent(const uint64_t& aID, const uint32_t& aEventType)
   bool fromUser = true; // XXX fix me
   RefPtr<xpcAccEvent> event = new xpcAccEvent(aEventType, xpcAcc, doc, node,
                                               fromUser);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }
@@ -263,7 +263,7 @@ DocAccessibleParent::RecvStateChangeEvent(const uint64_t& aID,
   RefPtr<xpcAccStateChangeEvent> event =
     new xpcAccStateChangeEvent(type, xpcAcc, doc, node, fromUser, state, extra,
                                aEnabled);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }
@@ -302,7 +302,7 @@ DocAccessibleParent::RecvCaretMoveEvent(const uint64_t& aID,
   uint32_t type = nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED;
   RefPtr<xpcAccCaretMoveEvent> event =
     new xpcAccCaretMoveEvent(type, xpcAcc, doc, node, fromUser, aOffset);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }
@@ -339,7 +339,7 @@ DocAccessibleParent::RecvTextChangeEvent(const uint64_t& aID,
   RefPtr<xpcAccTextChangeEvent> event =
     new xpcAccTextChangeEvent(type, xpcAcc, doc, node, aFromUser, aStart, aLen,
                               aIsInsert, aStr);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }
@@ -383,7 +383,7 @@ DocAccessibleParent::RecvSelectionEvent(const uint64_t& aID,
   xpcAccessibleDocument* xpcDoc = GetAccService()->GetXPCDocument(this);
   RefPtr<xpcAccEvent> event = new xpcAccEvent(aType, xpcTarget, xpcDoc,
                                               nullptr, false);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }
@@ -631,7 +631,7 @@ DocAccessibleParent::MaybeInitWindowEmulation()
                                                IID_IAccessible,
                                                getter_AddRefs(hwndAcc)))) {
       RefPtr<IDispatch> wrapped(mscom::PassthruProxy::Wrap<IDispatch>(WrapNotNull(hwndAcc)));
-      hWndAccHolder.Set(IDispatchHolder::COMPtrType(mscom::ToProxyUniquePtr(Move(wrapped))));
+      hWndAccHolder.Set(IDispatchHolder::COMPtrType(mscom::ToProxyUniquePtr(std::move(wrapped))));
     }
 
     Unused << SendEmulatedWindow(reinterpret_cast<uintptr_t>(mEmulatedWindowHandle),
@@ -671,14 +671,14 @@ DocAccessibleParent::SendParentCOMProxy()
 
   RefPtr<IDispatch> wrapped(mscom::PassthruProxy::Wrap<IDispatch>(WrapNotNull(nativeAcc)));
 
-  IDispatchHolder::COMPtrType ptr(mscom::ToProxyUniquePtr(Move(wrapped)));
-  IDispatchHolder holder(Move(ptr));
+  IDispatchHolder::COMPtrType ptr(mscom::ToProxyUniquePtr(std::move(wrapped)));
+  IDispatchHolder holder(std::move(ptr));
   if (!PDocAccessibleParent::SendParentCOMProxy(holder)) {
     return;
   }
 
 #if defined(MOZ_CONTENT_SANDBOX)
-  mParentProxyStream = Move(holder.GetPreservedStream());
+  mParentProxyStream = std::move(holder.GetPreservedStream());
 #endif // defined(MOZ_CONTENT_SANDBOX)
 }
 
@@ -749,7 +749,7 @@ DocAccessibleParent::RecvFocusEvent(const uint64_t& aID,
   bool fromUser = true; // XXX fix me
   RefPtr<xpcAccEvent> event = new xpcAccEvent(nsIAccessibleEvent::EVENT_FOCUS,
                                               xpcAcc, doc, node, fromUser);
-  nsCoreUtils::DispatchAccEvent(Move(event));
+  nsCoreUtils::DispatchAccEvent(std::move(event));
 
   return IPC_OK();
 }

accessible/ipc/other/ProxyAccessible.cpp

@@ -78,7 +78,7 @@ ProxyAccessible::RelationByType(RelationType aType) const
     if (ProxyAccessible* proxy = mDoc->GetAccessible(targetIDs[i]))
       targets.AppendElement(proxy);
 
-  return Move(targets);
+  return std::move(targets);
 }
 
 void
@@ -106,7 +106,7 @@ ProxyAccessible::Relations(nsTArray<RelationType>* aTypes,
     if (targets.IsEmpty())
       continue;
 
-    aTargetSets->AppendElement(Move(targets));
+    aTargetSets->AppendElement(std::move(targets));
     aTypes->AppendElement(static_cast<RelationType>(type));
   }
 }

accessible/ipc/win/COMPtrTypes.cpp

@@ -49,14 +49,14 @@ CreateHolderFromAccessible(NotNull<Accessible*> aAccToWrap)
   }
 
   ProxyUniquePtr<IAccessible> intercepted;
-  HRESULT hr = MainThreadHandoff::WrapInterface(Move(iaToProxy), payload,
+  HRESULT hr = MainThreadHandoff::WrapInterface(std::move(iaToProxy), payload,
                                                 (IAccessible**) mscom::getter_AddRefs(intercepted));
   MOZ_ASSERT(SUCCEEDED(hr));
   if (FAILED(hr)) {
     return nullptr;
   }
 
-  return IAccessibleHolder(Move(intercepted));
+  return IAccessibleHolder(std::move(intercepted));
 }
 
 IHandlerControlHolder
@@ -69,7 +69,7 @@ CreateHolderFromHandlerControl(mscom::ProxyUniquePtr<IHandlerControl> aHandlerCo
     return nullptr;
   }
 
-  return IHandlerControlHolder(Move(aHandlerControl));
+  return IHandlerControlHolder(std::move(aHandlerControl));
 }
 
 } // namespace a11y

accessible/ipc/win/DocAccessibleChild.cpp

@@ -108,7 +108,7 @@ DocAccessibleChild::PushDeferredEvent(UniquePtr<DeferredEvent> aEvent)
   }
 
   if (topLevelIPCDoc) {
-    topLevelIPCDoc->mDeferredEvents.AppendElement(Move(aEvent));
+    topLevelIPCDoc->mDeferredEvents.AppendElement(std::move(aEvent));
   }
 }