mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-26 03:35:33 +00:00
4fa2a5c829
When GMPService::GetContentParent returns a MozPromise, we end up failing in test_peerConnection_scaleResolution.html with e10s enabled because we Close() the GMPContentParent twice. The test causes two GMPVideoEncoderParents to be created. When the number of IPDL actors on the GMPContentParent reach 0, we close the IPC connection. With GetContentParent() returning a MozPromise, it's more async, and so we can end up requesting the content parent in order to create the second GMPVideoEncoderParent, but while we're waiting for the promise to resolve the previous GMPVideoEncoderParent is destroyed and the GMPContentParent closes its IPC connection. Then the GetContentParent promise resolves, and that fails to operate correctly since it's closed its IPC connection. My solution here is to add a "blocker" that prevents the GMPContentParent from being shutdown while we're waiting for the GetContentParent promise to resolve. MozReview-Commit-ID: HxBkFkmv0tV --HG-- extra : rebase_source : 59aa7bcfe8b8f44274d136d6147a946542a64fff extra : source : 59ab10349b58b0fbe13dca9312ec82332f7c3dbe
125 lines
3.5 KiB
C++
125 lines
3.5 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef GMPContentParent_h_
|
|
#define GMPContentParent_h_
|
|
|
|
#include "mozilla/gmp/PGMPContentParent.h"
|
|
#include "GMPSharedMemManager.h"
|
|
#include "nsISupportsImpl.h"
|
|
|
|
namespace mozilla {
|
|
namespace gmp {
|
|
|
|
class GMPAudioDecoderParent;
|
|
class GMPDecryptorParent;
|
|
class GMPParent;
|
|
class GMPVideoDecoderParent;
|
|
class GMPVideoEncoderParent;
|
|
|
|
class GMPContentParent final : public PGMPContentParent,
|
|
public GMPSharedMem
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GMPContentParent)
|
|
|
|
explicit GMPContentParent(GMPParent* aParent = nullptr);
|
|
|
|
nsresult GetGMPVideoDecoder(GMPVideoDecoderParent** aGMPVD,
|
|
uint32_t aDecryptorId);
|
|
void VideoDecoderDestroyed(GMPVideoDecoderParent* aDecoder);
|
|
|
|
nsresult GetGMPVideoEncoder(GMPVideoEncoderParent** aGMPVE);
|
|
void VideoEncoderDestroyed(GMPVideoEncoderParent* aEncoder);
|
|
|
|
nsresult GetGMPDecryptor(GMPDecryptorParent** aGMPKS);
|
|
void DecryptorDestroyed(GMPDecryptorParent* aSession);
|
|
|
|
nsresult GetGMPAudioDecoder(GMPAudioDecoderParent** aGMPAD);
|
|
void AudioDecoderDestroyed(GMPAudioDecoderParent* aDecoder);
|
|
|
|
nsIThread* GMPThread();
|
|
|
|
// GMPSharedMem
|
|
void CheckThread() override;
|
|
|
|
void SetDisplayName(const nsCString& aDisplayName)
|
|
{
|
|
mDisplayName = aDisplayName;
|
|
}
|
|
const nsCString& GetDisplayName()
|
|
{
|
|
return mDisplayName;
|
|
}
|
|
void SetPluginId(const uint32_t aPluginId)
|
|
{
|
|
mPluginId = aPluginId;
|
|
}
|
|
uint32_t GetPluginId() const
|
|
{
|
|
return mPluginId;
|
|
}
|
|
|
|
class CloseBlocker {
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CloseBlocker)
|
|
|
|
explicit CloseBlocker(GMPContentParent* aParent)
|
|
: mParent(aParent)
|
|
{
|
|
mParent->AddCloseBlocker();
|
|
}
|
|
RefPtr<GMPContentParent> mParent;
|
|
private:
|
|
~CloseBlocker() {
|
|
mParent->RemoveCloseBlocker();
|
|
}
|
|
};
|
|
|
|
private:
|
|
|
|
void AddCloseBlocker();
|
|
void RemoveCloseBlocker();
|
|
|
|
~GMPContentParent();
|
|
|
|
void ActorDestroy(ActorDestroyReason aWhy) override;
|
|
|
|
PGMPVideoDecoderParent* AllocPGMPVideoDecoderParent(const uint32_t& aDecryptorId) override;
|
|
bool DeallocPGMPVideoDecoderParent(PGMPVideoDecoderParent* aActor) override;
|
|
|
|
PGMPVideoEncoderParent* AllocPGMPVideoEncoderParent() override;
|
|
bool DeallocPGMPVideoEncoderParent(PGMPVideoEncoderParent* aActor) override;
|
|
|
|
PGMPDecryptorParent* AllocPGMPDecryptorParent() override;
|
|
bool DeallocPGMPDecryptorParent(PGMPDecryptorParent* aActor) override;
|
|
|
|
PGMPAudioDecoderParent* AllocPGMPAudioDecoderParent() override;
|
|
bool DeallocPGMPAudioDecoderParent(PGMPAudioDecoderParent* aActor) override;
|
|
|
|
void CloseIfUnused();
|
|
// Needed because NewRunnableMethod tried to use the class that the method
|
|
// lives on to store the receiver, but PGMPContentParent isn't refcounted.
|
|
void Close()
|
|
{
|
|
PGMPContentParent::Close();
|
|
}
|
|
|
|
nsTArray<RefPtr<GMPVideoDecoderParent>> mVideoDecoders;
|
|
nsTArray<RefPtr<GMPVideoEncoderParent>> mVideoEncoders;
|
|
nsTArray<RefPtr<GMPDecryptorParent>> mDecryptors;
|
|
nsTArray<RefPtr<GMPAudioDecoderParent>> mAudioDecoders;
|
|
nsCOMPtr<nsIThread> mGMPThread;
|
|
RefPtr<GMPParent> mParent;
|
|
nsCString mDisplayName;
|
|
uint32_t mPluginId;
|
|
uint32_t mCloseBlockerCount = 0;
|
|
};
|
|
|
|
} // namespace gmp
|
|
} // namespace mozilla
|
|
|
|
#endif // GMPParent_h_
|