Bug 1289211 - Rename InfallibleTArray to nsTArray in gfx/vr/ r=kip

Differential Revision: https://phabricator.services.mozilla.com/D36956 --HG-- extra : moz-landing-system : lando
dothq · Jul 10, 2019 · 420c8e8 · 420c8e8
1 parent 06f829c
commit 420c8e8
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/gfx/vr/VRManager.cpp b/gfx/vr/VRManager.cpp
@@ -898,7 +898,7 @@ void VRManager::StopVRNavigation(const uint32_t& aDisplayID,
 
 #if !defined(MOZ_WIDGET_ANDROID)
 
-bool VRManager::RunPuppet(const InfallibleTArray<uint64_t>& aBuffer,
+bool VRManager::RunPuppet(const nsTArray<uint64_t>& aBuffer,
                           VRManagerParent* aManagerParent) {
   if (!StaticPrefs::dom_vr_puppet_enabled()) {
     // Sanity check to ensure that a compromised content process

diff --git a/gfx/vr/VRManager.h b/gfx/vr/VRManager.h
@@ -53,7 +53,7 @@ class VRManager {
                         const TimeDuration& aTimeout);
   void Shutdown();
 #if !defined(MOZ_WIDGET_ANDROID)
-  bool RunPuppet(const InfallibleTArray<uint64_t>& aBuffer,
+  bool RunPuppet(const nsTArray<uint64_t>& aBuffer,
                  VRManagerParent* aManagerParent);
   void ResetPuppet(VRManagerParent* aManagerParent);
 #endif

diff --git a/gfx/vr/VRPuppetCommandBuffer.cpp b/gfx/vr/VRPuppetCommandBuffer.cpp
@@ -32,7 +32,7 @@ VRPuppetCommandBuffer::~VRPuppetCommandBuffer() {
   MOZ_COUNT_DTOR(VRPuppetCommandBuffer);
 }
 
-void VRPuppetCommandBuffer::Submit(const InfallibleTArray<uint64_t>& aBuffer) {
+void VRPuppetCommandBuffer::Submit(const nsTArray<uint64_t>& aBuffer) {
   MutexAutoLock lock(mMutex);
   mBuffer.AppendElements(aBuffer);
   mEnded = false;

diff --git a/gfx/vr/VRPuppetCommandBuffer.h b/gfx/vr/VRPuppetCommandBuffer.h
@@ -180,7 +180,7 @@ class VRPuppetCommandBuffer {
   static VRPuppetCommandBuffer& Get();
 
   // Interface to VRTestSystem
-  void Submit(const InfallibleTArray<uint64_t>& aBuffer);
+  void Submit(const nsTArray<uint64_t>& aBuffer);
   void Reset();
   bool HasEnded();
 

diff --git a/gfx/vr/VRServiceHost.cpp b/gfx/vr/VRServiceHost.cpp
@@ -181,7 +181,7 @@ void VRServiceHost::ShutdownVRProcess() {
 
 #endif  // !defined(MOZ_WIDGET_ANDROID)
 
-void VRServiceHost::PuppetSubmit(const InfallibleTArray<uint64_t>& aBuffer) {
+void VRServiceHost::PuppetSubmit(const nsTArray<uint64_t>& aBuffer) {
   if (mVRProcessEnabled) {
     mPuppetActive = true;
     // TODO - Implement VR puppet support for VR process (Bug 1555188)

diff --git a/gfx/vr/VRServiceHost.h b/gfx/vr/VRServiceHost.h
@@ -26,7 +26,7 @@ class VRServiceHost {
   void CreateService(volatile VRExternalShmem* aShmem);
 #endif
 
-  void PuppetSubmit(const InfallibleTArray<uint64_t>& aBuffer);
+  void PuppetSubmit(const nsTArray<uint64_t>& aBuffer);
   void PuppetReset();
   bool PuppetHasEnded();
 

diff --git a/gfx/vr/ipc/VRManagerChild.cpp b/gfx/vr/ipc/VRManagerChild.cpp
@@ -260,7 +260,7 @@ mozilla::ipc::IPCResult VRManagerChild::RecvNotifyPuppetResetComplete() {
   return IPC_OK();
 }
 
-void VRManagerChild::RunPuppet(const InfallibleTArray<uint64_t>& aBuffer,
+void VRManagerChild::RunPuppet(const nsTArray<uint64_t>& aBuffer,
                                dom::Promise* aPromise, ErrorResult& aRv) {
   if (mRunPuppetPromise) {
     // We only allow one puppet script to run simultaneously.

diff --git a/gfx/vr/ipc/VRManagerChild.h b/gfx/vr/ipc/VRManagerChild.h
@@ -84,8 +84,8 @@ class VRManagerChild : public PVRManagerChild {
 
   virtual void HandleFatalError(const char* aMsg) const override;
 
-  void RunPuppet(const InfallibleTArray<uint64_t>& aBuffer,
-                 dom::Promise* aPromise, ErrorResult& aRv);
+  void RunPuppet(const nsTArray<uint64_t>& aBuffer, dom::Promise* aPromise,
+                 ErrorResult& aRv);
   void ResetPuppet(dom::Promise* aPromise, ErrorResult& aRv);
 
  protected:

diff --git a/gfx/vr/ipc/VRManagerParent.cpp b/gfx/vr/ipc/VRManagerParent.cpp
@@ -188,7 +188,7 @@ mozilla::ipc::IPCResult VRManagerParent::RecvControllerListenerRemoved() {
 }
 
 mozilla::ipc::IPCResult VRManagerParent::RecvRunPuppet(
-    const InfallibleTArray<uint64_t>& aBuffer) {
+    const nsTArray<uint64_t>& aBuffer) {
 #if defined(MOZ_WIDGET_ANDROID)
   // Not yet implemented for Android / GeckoView
   // See Bug 1555192

diff --git a/gfx/vr/ipc/VRManagerParent.h b/gfx/vr/ipc/VRManagerParent.h
@@ -68,8 +68,7 @@ class VRManagerParent final : public PVRManagerParent {
   mozilla::ipc::IPCResult RecvStartActivity();
   mozilla::ipc::IPCResult RecvStopActivity();
 
-  mozilla::ipc::IPCResult RecvRunPuppet(
-      const InfallibleTArray<uint64_t>& aBuffer);
+  mozilla::ipc::IPCResult RecvRunPuppet(const nsTArray<uint64_t>& aBuffer);
   mozilla::ipc::IPCResult RecvResetPuppet();
 
  private: