Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b82fa1825412 (bug 1279612) for static analysis bustage

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2016-09-21 20:46:01 -07:00
parent 4cbbce3d03
commit fa1e0afddb
2 changed files with 2 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
dom/media/gmp/GMPServiceParent.cpp
View File

@ -44,8 +44,6 @@
#include <limits>
#include "MediaPrefs.h"
using mozilla::ipc::Transport;
namespace mozilla {
#ifdef LOG
@ -82,8 +80,7 @@ GeckoMediaPluginServiceParent::GetSingleton()
NS_IMPL_ISUPPORTS_INHERITED(GeckoMediaPluginServiceParent,
GeckoMediaPluginService,
mozIGeckoMediaPluginChromeService,
nsIAsyncShutdownBlocker)
mozIGeckoMediaPluginChromeService)
GeckoMediaPluginServiceParent::GeckoMediaPluginServiceParent()
: mShuttingDown(false)
@ -94,7 +91,6 @@ GeckoMediaPluginServiceParent::GeckoMediaPluginServiceParent()
, mWaitingForPluginsSyncShutdown(false)
, mInitPromiseMonitor("GeckoMediaPluginServiceParent::mInitPromiseMonitor")
, mLoadPluginsFromDiskComplete(false)
, mServiceUserCount(0)
{
MOZ_ASSERT(NS_IsMainThread());
mInitPromise.SetMonitor(&mInitPromiseMonitor);
@ -1842,61 +1838,6 @@ static bool IsNodeIdValid(GMPParent* aParent) {
return !aParent->GetNodeId().IsEmpty();
}
static nsCOMPtr<nsIAsyncShutdownClient>
GetShutdownBarrier()
{
nsCOMPtr<nsIAsyncShutdownService> svc = services::GetAsyncShutdown();
MOZ_RELEASE_ASSERT(svc);
nsCOMPtr<nsIAsyncShutdownClient> barrier;
nsresult rv = svc->GetXpcomWillShutdown(getter_AddRefs(barrier));
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
MOZ_RELEASE_ASSERT(barrier);
return barrier.forget();
}
NS_IMETHODIMP
GeckoMediaPluginServiceParent::GetName(nsAString& aName)
{
aName = NS_LITERAL_STRING("GeckoMediaPluginServiceParent: shutdown");
return NS_OK;
}
NS_IMETHODIMP
GeckoMediaPluginServiceParent::GetState(nsIPropertyBag**)
{
return NS_OK;
}
NS_IMETHODIMP
GeckoMediaPluginServiceParent::BlockShutdown(nsIAsyncShutdownClient*)
{
return NS_OK;
}
void
GeckoMediaPluginServiceParent::ServiceUserCreated()
{
MOZ_ASSERT(mServiceUserCount >= 0);
if (++mServiceUserCount == 1) {
nsresult rv = GetShutdownBarrier()->AddBlocker(
this, NS_LITERAL_STRING(__FILE__), __LINE__,
NS_LITERAL_STRING("GeckoMediaPluginServiceParent shutdown"));
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
}
}
void
GeckoMediaPluginServiceParent::ServiceUserDestroyed()
{
MOZ_ASSERT(mServiceUserCount > 0);
if (--mServiceUserCount == 0) {
nsresult rv = GetShutdownBarrier()->RemoveBlocker(this);
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
}
}
void
GeckoMediaPluginServiceParent::ClearStorage()
{
@ -1936,9 +1877,6 @@ GeckoMediaPluginServiceParent::GetById(uint32_t aPluginId)
GMPServiceParent::~GMPServiceParent()
{
NS_DispatchToMainThread(
NewRunnableMethod(mService.get(),
&GeckoMediaPluginServiceParent::ServiceUserDestroyed));
}
bool
@ -2038,37 +1976,9 @@ private:
nsAutoPtr<GMPServiceParent> mToDelete;
};
void GMPServiceParent::CloseTransport(Monitor* aSyncMonitor, bool* aCompleted)
{
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
MonitorAutoLock lock(*aSyncMonitor);
// This deletes the transport.
SetTransport(nullptr);
*aCompleted = true;
lock.NotifyAll();
}
void
GMPServiceParent::ActorDestroy(ActorDestroyReason aWhy)
{
Monitor monitor("DeleteGMPServiceParent");
bool completed = false;
// Make sure the IPC channel is closed before destroying mToDelete.
MonitorAutoLock lock(monitor);
auto task = NewNonOwningRunnableMethod<Monitor*, bool*>(this,
&GMPServiceParent::CloseTransport,
&monitor,
&completed);
XRE_GetIOMessageLoop()->PostTask(Move(task));
while (!completed) {
lock.Wait();
}
NS_DispatchToCurrentThread(new DeleteGMPServiceParent(this));
}
@ -2107,17 +2017,12 @@ GMPServiceParent::Create(Transport* aTransport, ProcessId aOtherPid)
RefPtr<GeckoMediaPluginServiceParent> gmp =
GeckoMediaPluginServiceParent::GetSingleton();
if (gmp->mShuttingDown) {
// Shutdown is initiated. There is no point creating a new actor.
return nullptr;
}
nsAutoPtr<GMPServiceParent> serviceParent(new GMPServiceParent(gmp));
nsCOMPtr<nsIThread> gmpThread;
nsresult rv = gmp->GetThread(getter_AddRefs(gmpThread));
NS_ENSURE_SUCCESS(rv, nullptr);
nsAutoPtr<GMPServiceParent> serviceParent(new GMPServiceParent(gmp));
bool ok;
rv = gmpThread->Dispatch(new OpenPGMPServiceParent(serviceParent,
aTransport,

14
dom/media/gmp/GMPServiceParent.h
View File

@ -12,7 +12,6 @@
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
#include "mozilla/Atomics.h"
#include "nsIAsyncShutdown.h"
#include "nsThreadUtils.h"
#include "mozilla/MozPromise.h"
#include "GMPStorage.h"
@ -26,7 +25,6 @@ class GMPParent;
class GeckoMediaPluginServiceParent final : public GeckoMediaPluginService
, public mozIGeckoMediaPluginChromeService
, public nsIAsyncShutdownBlocker
{
public:
static already_AddRefed<GeckoMediaPluginServiceParent> GetSingleton();
@ -35,7 +33,6 @@ public:
nsresult Init() override;
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIASYNCSHUTDOWNBLOCKER
// mozIGeckoMediaPluginService
NS_IMETHOD GetPluginVersionForAPI(const nsACString& aAPI,
@ -68,10 +65,6 @@ public:
nsresult ForgetThisSiteNative(const nsAString& aSite,
const mozilla::OriginAttributesPattern& aPattern);
// Notifies that some user of this class is created/destroyed.
void ServiceUserCreated();
void ServiceUserDestroyed();
private:
friend class GMPServiceParent;
@ -224,10 +217,6 @@ private:
// Hashes nodeId to the hashtable of storage for that nodeId.
nsRefPtrHashtable<nsCStringHashKey, GMPStorage> mTempGMPStorage;
// Tracks how many users are running (on the GMP thread). Only when this count
// drops to 0 can we safely shut down the thread.
MainThreadOnly<int32_t> mServiceUserCount;
};
nsresult ReadSalt(nsIFile* aPath, nsACString& aOutData);
@ -241,7 +230,6 @@ public:
explicit GMPServiceParent(GeckoMediaPluginServiceParent* aService)
: mService(aService)
{
mService->ServiceUserCreated();
}
virtual ~GMPServiceParent();
@ -271,8 +259,6 @@ public:
nsresult* aOutRv) override;
private:
void CloseTransport(Monitor* aSyncMonitor, bool* aCompleted);
RefPtr<GeckoMediaPluginServiceParent> mService;
};