Bug 1143478 - Rename mozilla::Pair to CompactPair. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D64511 --HG-- rename : mfbt/Pair.h => mfbt/CompactPair.h extra : moz-landing-system : lando
dothq · Mar 11, 2020 · a27e438 · a27e438
1 parent d2ae8db
commit a27e438
Show file tree

Hide file tree

Showing 71 changed files with 568 additions and 548 deletions.
diff --git a/dom/base/Document.h b/dom/base/Document.h
@@ -9,7 +9,6 @@
 #include "mozilla/EventStates.h"  // for EventStates
 #include "mozilla/FlushType.h"    // for enum
 #include "mozilla/MozPromise.h"   // for MozPromise
-#include "mozilla/Pair.h"         // for Pair
 #include "mozilla/Saturate.h"     // for SaturateUint32
 #include "nsAutoPtr.h"            // for member
 #include "nsCOMArray.h"           // for member

diff --git a/dom/base/PlacesObservers.h b/dom/base/PlacesObservers.h
@@ -12,7 +12,6 @@
 #include "mozilla/dom/PlacesObserversBinding.h"
 #include "mozilla/dom/PlacesEvent.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/Pair.h"
 #include "mozilla/places/INativePlacesEventCallback.h"
 #include "nsIWeakReferenceUtils.h"
 

diff --git a/dom/base/PlacesWeakCallbackWrapper.h b/dom/base/PlacesWeakCallbackWrapper.h
@@ -9,7 +9,6 @@
 
 #include "mozilla/dom/PlacesObserversBinding.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/Pair.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {

diff --git a/dom/canvas/ProducerConsumerQueue.h b/dom/canvas/ProducerConsumerQueue.h
@@ -10,6 +10,7 @@
 
 #include <atomic>
 #include <tuple>
+#include <utility>
 #include <vector>
 #include "mozilla/ipc/SharedMemoryBasic.h"
 #include "mozilla/Assertions.h"
@@ -1984,23 +1985,23 @@ struct PcqParamTraits<Maybe<Variant<T, Ts...>>> {
 // ---------------------------------------------------------------
 
 template <typename TypeA, typename TypeB>
-struct PcqParamTraits<Pair<TypeA, TypeB>> {
-  using ParamType = Pair<TypeA, TypeB>;
+struct PcqParamTraits<std::pair<TypeA, TypeB>> {
+  using ParamType = std::pair<TypeA, TypeB>;
 
   static PcqStatus Write(ProducerView& aProducerView, const ParamType& aArg) {
-    aProducerView.WriteParam(aArg.first());
-    return aProducerView.WriteParam(aArg.second());
+    aProducerView.WriteParam(aArg.first);
+    return aProducerView.WriteParam(aArg.second);
   }
 
   static PcqStatus Read(ConsumerView& aConsumerView, ParamType* aArg) {
-    aConsumerView.ReadParam(aArg ? (&aArg->first()) : nullptr);
-    return aConsumerView.ReadParam(aArg ? (&aArg->second()) : nullptr);
+    aConsumerView.ReadParam(aArg ? (&aArg->first) : nullptr);
+    return aConsumerView.ReadParam(aArg ? (&aArg->second) : nullptr);
   }
 
   template <typename View>
   static size_t MinSize(View& aView, const ParamType* aArg) {
-    return aView.MinSizeParam(aArg ? aArg->first() : nullptr) +
-           aView.MinSizeParam(aArg ? aArg->second() : nullptr);
+    return aView.MinSizeParam(aArg ? aArg->first : nullptr) +
+           aView.MinSizeParam(aArg ? aArg->second : nullptr);
   }
 };
 

diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
@@ -4004,7 +4004,7 @@ HTMLMediaElement::HTMLMediaElement(
       mTracksCaptured(nullptr, "HTMLMediaElement::mTracksCaptured"),
       mErrorSink(new ErrorSink(this)),
       mAudioChannelWrapper(new AudioChannelAgentCallback(this)),
-      mSink(MakePair(nsString(), RefPtr<AudioDeviceInfo>())),
+      mSink(std::pair(nsString(), RefPtr<AudioDeviceInfo>())),
       mShowPoster(IsVideo()) {
   MOZ_ASSERT(mMainThreadEventTarget);
   MOZ_ASSERT(mAbstractMainThread);
@@ -4997,9 +4997,9 @@ nsresult HTMLMediaElement::FinishDecoderSetup(MediaDecoder* aDecoder) {
   NotifyDecoderPrincipalChanged();
 
   // Set sink device if we have one. Otherwise the default is used.
-  if (mSink.second()) {
+  if (mSink.second) {
     mDecoder
-        ->SetSink(mSink.second())
+        ->SetSink(mSink.second)
 #ifdef DEBUG
         ->Then(mAbstractMainThread, __func__,
                [](const GenericPromise::ResolveOrRejectValue& aValue) {
@@ -5077,7 +5077,7 @@ void HTMLMediaElement::UpdateSrcMediaStreamPlaying(uint32_t aFlags) {
       mMediaStreamRenderer->Start();
     }
 
-    if (mSink.second()) {
+    if (mSink.second) {
       NS_WARNING(
           "setSinkId() when playing a MediaStream is not supported yet and "
           "will be ignored");
@@ -7547,7 +7547,7 @@ already_AddRefed<Promise> HTMLMediaElement::SetSinkId(const nsAString& aSinkId,
     return nullptr;
   }
 
-  if (mSink.first().Equals(aSinkId)) {
+  if (mSink.first.Equals(aSinkId)) {
     promise->MaybeResolveWithUndefined();
     return promise.forget();
   }
@@ -7588,7 +7588,7 @@ already_AddRefed<Promise> HTMLMediaElement::SetSinkId(const nsAString& aSinkId,
              [promise, self = RefPtr<HTMLMediaElement>(this),
               sinkId](const SinkInfoPromise::ResolveOrRejectValue& aValue) {
                if (aValue.IsResolve()) {
-                 self->mSink = MakePair(sinkId, aValue.ResolveValue());
+                 self->mSink = std::pair(sinkId, aValue.ResolveValue());
                  promise->MaybeResolveWithUndefined();
                } else {
                  switch (aValue.RejectValue()) {

diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
@@ -31,6 +31,8 @@
 #include "nsStubMutationObserver.h"
 #include "MediaSegment.h"  // for PrincipalHandle, GraphTime
 
+#include <utility>
+
 // X.h on Linux #defines CurrentTime as 0L, so we have to #undef it here.
 #ifdef CurrentTime
 #  undef CurrentTime
@@ -735,7 +737,7 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   // empty and the default device is being used.
   void GetSinkId(nsString& aSinkId) {
     MOZ_ASSERT(NS_IsMainThread());
-    aSinkId = mSink.first();
+    aSinkId = mSink.first;
   }
 
   // This is used to notify MediaElementAudioSourceNode that media element is
@@ -1902,7 +1904,7 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   // unplugged. It can be set to ("", nullptr). It follows the spec attribute:
   // https://w3c.github.io/mediacapture-output/#htmlmediaelement-extensions
   // Read/Write from the main thread only.
-  Pair<nsString, RefPtr<AudioDeviceInfo>> mSink;
+  std::pair<nsString, RefPtr<AudioDeviceInfo>> mSink;
 
   // This flag is used to control when the user agent is to show a poster frame
   // for a video element instead of showing the video contents.

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -5474,11 +5474,11 @@ nsresult ContentParent::AboutToLoadHttpFtpDocumentForChild(
 nsresult ContentParent::TransmitPermissionsForPrincipal(
     nsIPrincipal* aPrincipal) {
   // Create the key, and send it down to the content process.
-  nsTArray<Pair<nsCString, nsCString>> pairs =
+  nsTArray<std::pair<nsCString, nsCString>> pairs =
       nsPermissionManager::GetAllKeysForPrincipal(aPrincipal);
   MOZ_ASSERT(pairs.Length() >= 1);
   for (auto& pair : pairs) {
-    EnsurePermissionsByKey(pair.first(), pair.second());
+    EnsurePermissionsByKey(pair.first, pair.second);
   }
 
   return NS_OK;

diff --git a/dom/media/VideoOutput.h b/dom/media/VideoOutput.h
@@ -41,7 +41,7 @@ class VideoOutput : public DirectMediaTrackListener {
     TimeStamp now = TimeStamp::Now();
     size_t nrChunksInPast = 0;
     for (const auto& idChunkPair : mFrames) {
-      const VideoChunk& chunk = idChunkPair.second();
+      const VideoChunk& chunk = idChunkPair.second;
       if (chunk.mTimeStamp > now) {
         break;
       }
@@ -72,8 +72,8 @@ class VideoOutput : public DirectMediaTrackListener {
     PrincipalHandle lastPrincipalHandle = PRINCIPAL_HANDLE_NONE;
 
     for (const auto& idChunkPair : mFrames) {
-      ImageContainer::FrameID frameId = idChunkPair.first();
-      const VideoChunk& chunk = idChunkPair.second();
+      ImageContainer::FrameID frameId = idChunkPair.first;
+      const VideoChunk& chunk = idChunkPair.second;
       const VideoFrame& frame = chunk.mFrame;
       Image* image = frame.GetImage();
       if (frame.GetForceBlack() || !mEnabled) {
@@ -119,7 +119,7 @@ class VideoOutput : public DirectMediaTrackListener {
     }
 
     mVideoFrameContainer->SetCurrentFrames(
-        mFrames[0].second().mFrame.GetIntrinsicSize(), images);
+        mFrames[0].second.mFrame.GetIntrinsicSize(), images);
     mMainThread->Dispatch(NewRunnableMethod("VideoFrameContainer::Invalidate",
                                             mVideoFrameContainer,
                                             &VideoFrameContainer::Invalidate));
@@ -142,7 +142,8 @@ class VideoOutput : public DirectMediaTrackListener {
         // future. If this happens, we clear the buffered frames and start over.
         mFrames.ClearAndRetainStorage();
       }
-      mFrames.AppendElement(MakePair(mVideoFrameContainer->NewFrameID(), *i));
+      mFrames.AppendElement(
+          std::make_pair(mVideoFrameContainer->NewFrameID(), *i));
       mLastFrameTime = i->mTimeStamp;
     }
 
@@ -187,7 +188,7 @@ class VideoOutput : public DirectMediaTrackListener {
     // Since mEnabled will affect whether frames are real, or black, we assign
     // new FrameIDs whenever this changes.
     for (auto& idChunkPair : mFrames) {
-      idChunkPair.first() = mVideoFrameContainer->NewFrameID();
+      idChunkPair.first = mVideoFrameContainer->NewFrameID();
     }
     SendFramesEnsureLocked();
   }
@@ -200,7 +201,7 @@ class VideoOutput : public DirectMediaTrackListener {
   bool mEnabled = true;
   // This array is accessed from both the direct video thread, and the graph
   // thread. Protected by mMutex.
-  nsTArray<Pair<ImageContainer::FrameID, VideoChunk>> mFrames;
+  nsTArray<std::pair<ImageContainer::FrameID, VideoChunk>> mFrames;
   const RefPtr<VideoFrameContainer> mVideoFrameContainer;
   const RefPtr<AbstractThread> mMainThread;
   const layers::ImageContainer::ProducerID mProducerID =

diff --git a/dom/media/gmp/ChromiumCDMAdapter.cpp b/dom/media/gmp/ChromiumCDMAdapter.cpp
@@ -39,7 +39,7 @@ static void InitializeHooks();
 #endif
 
 ChromiumCDMAdapter::ChromiumCDMAdapter(
-    nsTArray<Pair<nsCString, nsCString>>&& aHostPathPairs) {
+    nsTArray<std::pair<nsCString, nsCString>>&& aHostPathPairs) {
 #ifdef XP_WIN
   InitializeHooks();
 #endif
@@ -282,10 +282,10 @@ cdm::PlatformFile HostFile::TakePlatformFile() {
 }
 
 void ChromiumCDMAdapter::PopulateHostFiles(
-    nsTArray<Pair<nsCString, nsCString>>&& aHostPathPairs) {
+    nsTArray<std::pair<nsCString, nsCString>>&& aHostPathPairs) {
   for (const auto& pair : aHostPathPairs) {
-    mHostFiles.AppendElement(HostFileData(mozilla::HostFile(pair.first()),
-                                          mozilla::HostFile(pair.second())));
+    mHostFiles.AppendElement(HostFileData(mozilla::HostFile(pair.first),
+                                          mozilla::HostFile(pair.second)));
   }
 }
 

diff --git a/dom/media/gmp/ChromiumCDMAdapter.h b/dom/media/gmp/ChromiumCDMAdapter.h
@@ -12,7 +12,8 @@
 #include "nsTArray.h"
 #include "content_decryption_module_ext.h"
 #include "nsString.h"
-#include "mozilla/Pair.h"
+
+#include <utility>
 
 struct GMPPlatformAPI;
 
@@ -54,7 +55,7 @@ struct HostFileData {
 class ChromiumCDMAdapter : public gmp::GMPAdapter {
  public:
   explicit ChromiumCDMAdapter(
-      nsTArray<Pair<nsCString, nsCString>>&& aHostPathPairs);
+      nsTArray<std::pair<nsCString, nsCString>>&& aHostPathPairs);
 
   void SetAdaptee(PRLibrary* aLib) override;
 
@@ -68,7 +69,8 @@ class ChromiumCDMAdapter : public gmp::GMPAdapter {
                        int32_t aHostVersion);
 
  private:
-  void PopulateHostFiles(nsTArray<Pair<nsCString, nsCString>>&& aHostFilePaths);
+  void PopulateHostFiles(
+      nsTArray<std::pair<nsCString, nsCString>>&& aHostFilePaths);
 
   PRLibrary* mLib = nullptr;
   nsTArray<HostFileData> mHostFiles;

diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
@@ -380,7 +380,7 @@ static bool GetSigPath(const int aRelativeLayers,
 #endif
 
 static bool AppendHostPath(nsCOMPtr<nsIFile>& aFile,
-                           nsTArray<Pair<nsCString, nsCString>>& aPaths) {
+                           nsTArray<std::pair<nsCString, nsCString>>& aPaths) {
   nsString str;
   if (!FileExists(aFile) || !ResolveLinks(aFile) ||
       NS_FAILED(aFile->GetPath(str))) {
@@ -410,19 +410,21 @@ static bool AppendHostPath(nsCOMPtr<nsIFile>& aFile,
   sigFilePath =
       nsCString(NS_ConvertUTF16toUTF8(str) + NS_LITERAL_CSTRING(".sig"));
 #endif
-  aPaths.AppendElement(MakePair(std::move(filePath), std::move(sigFilePath)));
+  aPaths.AppendElement(
+      std::make_pair(std::move(filePath), std::move(sigFilePath)));
   return true;
 }
 
-nsTArray<Pair<nsCString, nsCString>> GMPChild::MakeCDMHostVerificationPaths() {
+nsTArray<std::pair<nsCString, nsCString>>
+GMPChild::MakeCDMHostVerificationPaths() {
   // Record the file path and its sig file path.
-  nsTArray<Pair<nsCString, nsCString>> paths;
+  nsTArray<std::pair<nsCString, nsCString>> paths;
   // Plugin binary path.
   nsCOMPtr<nsIFile> path;
   nsString str;
   if (GetPluginFile(mPluginPath, path) && FileExists(path) &&
       ResolveLinks(path) && NS_SUCCEEDED(path->GetPath(str))) {
-    paths.AppendElement(MakePair(
+    paths.AppendElement(std::make_pair(
         nsCString(NS_ConvertUTF16toUTF8(str)),
         nsCString(NS_ConvertUTF16toUTF8(str) + NS_LITERAL_CSTRING(".sig"))));
   }
@@ -474,14 +476,14 @@ nsTArray<Pair<nsCString, nsCString>> GMPChild::MakeCDMHostVerificationPaths() {
   return paths;
 }
 
-static nsCString ToCString(const nsTArray<Pair<nsCString, nsCString>>& aPairs) {
+static nsCString ToCString(
+    const nsTArray<std::pair<nsCString, nsCString>>& aPairs) {
   nsCString result;
   for (const auto& p : aPairs) {
     if (!result.IsEmpty()) {
       result.AppendLiteral(",");
     }
-    result.Append(
-        nsPrintfCString("(%s,%s)", p.first().get(), p.second().get()));
+    result.Append(nsPrintfCString("(%s,%s)", p.first.get(), p.second.get()));
   }
   return result;
 }

diff --git a/dom/media/gmp/GMPChild.h b/dom/media/gmp/GMPChild.h
@@ -7,7 +7,6 @@
 #define GMPChild_h_
 
 #include "mozilla/gmp/PGMPChild.h"
-#include "mozilla/Pair.h"
 #include "GMPTimerChild.h"
 #include "GMPStorageChild.h"
 #include "GMPLoader.h"
@@ -68,7 +67,7 @@ class GMPChild : public PGMPChild {
   GMPErr GetAPI(const char* aAPIName, void* aHostAPI, void** aPluginAPI,
                 uint32_t aDecryptorId = 0);
 
-  nsTArray<Pair<nsCString, nsCString>> MakeCDMHostVerificationPaths();
+  nsTArray<std::pair<nsCString, nsCString>> MakeCDMHostVerificationPaths();
 
   nsTArray<UniquePtr<GMPContentChild>> mGMPContentChildren;