mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 18:18:27 +00:00
c4d71010c8
- Bug 1200445 - Expose android native apps trough the navigator.mozApps api r=snorp,ferjm (5f2e5df93a)
- Bug 1199844 - limit webapp debug logging to webapp tests; r=fabrice (59bf73deb2)
- Bug 1199295 - Pass right loadingPrincipal to uriloader/prefetch - dom/apps (r=fabrice) (8bdab29703)
- Bug 1213170 - followup r=bustage on a CLOSED TREE (9ac5f0a677)
- Bug 1194243 - Keep the message manager alive in doUninstall() to be able to signal the result back; r=myk (3093189372)
- Bug 1154864 - Fix getScopeByLocalId use in PushService.jsm r=nsm (0f67e9de60)
- Bug 1196963 - Make extensions work without being in developer mode r=jduell (e120108628)
- Bug 1200851 - DataStoreService should update its permission map when the homescreen changes, r=fabrice (1582ac0320)
- Bug 1200851 - DataStoreService should update its permission map when the homescreen changes, r=fabrice (7949555b43)
- Bug 1186805 - Replace nsBaseHashtable::EnumerateRead() calls in dom/datastore/ with iterators, r=njn (0c6f234576)
- Bug 1208355 - Fix -Wshadow warnings in dom/datastore. r=baku (8b617685d4)
- Bug 1214092 - Part 1 of 1: Exposed WebSpeech API SpeechRecognition Interface to privileged apps. r=smaug (e33c92d4e8)
- Bug 1218337 - Part 1 of 1: Introduced permission 'speech-recognition' and used it in place of the app-check. r=smaug (1cdf67a55f)
- Bug 1051604 - Adapt VAD strategy on SpeechRecognition to be less strict on some devices with poor mics. r=smaug (911258b56e)
- Bug 1111135 - Part 1: Add audio-capture:3gpp perimission. r=fabrice (c98bee92a6)
- bit of 1196988 (a334242521)
- Bug 1193183 - Correctly implement SpeechRecognitionAlternative::confidence using ps_get_prob(). r=anatal (14a881b44f)
- Bug 1197455 - Call ps_set_search() only after successful grammar compilation. r=anatal (55d37ea0fb)
- Bug 1156560 - Prefer old CDMs on update if they are in use - r=cpearce (b763f1044a)
- Bug 1228215 - Add helper to do dir enumeration in GMPServiceParent. r=jwwang (1d3bc1eef0)
- Bug 1228215 - Store each GMP's storage and nodeId salt in separate directories. r=jwwang (20fb2b7a18)
- Bug 1172396 - Update GMP trial creation pref from chrome process - r=cpearce (123d97d03a)
- Bug 1228215 - Add a 'gmpName' parameter to GMPService::GetNodeId(), so each GMP can see a different nodeId for the same origin. r=jwwang (fceaef0c11)
- fixes for no EME (b70879a799)
- Bug 1228215 - Migrate existing GMP storage from post-42 pre-45 location to 45 location. r=jwwang (9da581744d)
- missing crash stuff (b537d416b3)
- Bug 1187193 - Use UserData() instead of Data() in ConstIter loops that used to be EnumerateRead's. r=njn (2a4c297f36)
- Bug 1211337 - Added crash report annotations tracking sync shutdown (60b3004394)
- Bug 1173195 - Don't assert success until successful in GMPSharedMemManager. r=edwin (3844ba6e20)
- Bug 1208289 - Log outstanding frames in GMP DrainComplete() and detect dropped ResetComplete. r=jwwang (eccf4dbecc)
- Bug 1224442: null-check GMP Parent Shmem messages from the Child to handle messages after shutdown r=cpearce (d12b9c57c2)
- add some defines (3c4fc2d5b9)
- Bug 1220929 - RemotePageManager should let us get all ports for a browser. r=Mossop (402fc2a536)
- Bug 1220929 - RemotePageManager should use documentURI and allow special URLs with query params. r=Mossop (9fc73b228e)
- Bug 1144422 - fix lightweight theme code to deal with invalid CSS so we don't mistakenly keep text colors, r=jaws (8b47394d6c)
- Bug 1229519: Fix download managers to pass eslint checks. r=mak (e4a684db58)
- Bug 1180113 - Introducing g2p algorithm inside pocketsphinx to allow out of dictionary words to be added to grammars. r=smaug (b3a23daf56)
- Bug 1202989 - Added check for 0 length phones string in addition to NULL. r=andrenatal (387faeb88c)
- Bug 1171082 - Now _WIN32_WINNT is defined to 0x0400 only if it is not defined, 0x0400 is the minimal version. Also modified update.sh to do this. r=smaug (bb7dd37c00)
- bits of Bug 1165518 - Part 2: Replace prlog.h with Logging.h. (fc0ca3ca20)
- Bug 1188970: Fix usage of forward slash in constructing webrtc trace file path. r=rjesup (8518b84be1)
- Bug 1225682 - Don't use nsAuto{,C}String as class member variables in docshell/. r=bz (839a57580e)
- Bug 1220916 - Remove "WARNING: TimelineConsumers could not be initialized" when running gtests, r=fitzgen (c89330afcc)
- Bug 1217836 - Add a readme file to our timeline backend, r=jsantell (df0ea6b198)
- enable shadow (dcad5bdb7a)
401 lines
12 KiB
C++
401 lines
12 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/. */
|
|
|
|
#include "GMPServiceChild.h"
|
|
#include "mozilla/dom/ContentChild.h"
|
|
#include "mozIGeckoMediaPluginService.h"
|
|
#include "mozIGeckoMediaPluginChromeService.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "GMPParent.h"
|
|
#include "GMPContentParent.h"
|
|
#include "nsXPCOMPrivate.h"
|
|
#include "mozilla/SyncRunnable.h"
|
|
#include "runnable_utils.h"
|
|
|
|
namespace mozilla {
|
|
|
|
#ifdef LOG
|
|
#undef LOG
|
|
#endif
|
|
|
|
#define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
|
|
#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
|
|
|
|
#ifdef __CLASS__
|
|
#undef __CLASS__
|
|
#endif
|
|
#define __CLASS__ "GMPService"
|
|
|
|
namespace gmp {
|
|
|
|
already_AddRefed<GeckoMediaPluginServiceChild>
|
|
GeckoMediaPluginServiceChild::GetSingleton()
|
|
{
|
|
MOZ_ASSERT(!XRE_IsParentProcess());
|
|
RefPtr<GeckoMediaPluginService> service(
|
|
GeckoMediaPluginService::GetGeckoMediaPluginService());
|
|
#ifdef DEBUG
|
|
if (service) {
|
|
nsCOMPtr<mozIGeckoMediaPluginChromeService> chromeService;
|
|
CallQueryInterface(service.get(), getter_AddRefs(chromeService));
|
|
MOZ_ASSERT(!chromeService);
|
|
}
|
|
#endif
|
|
return service.forget().downcast<GeckoMediaPluginServiceChild>();
|
|
}
|
|
|
|
class GetContentParentFromDone : public GetServiceChildCallback
|
|
{
|
|
public:
|
|
GetContentParentFromDone(const nsACString& aNodeId, const nsCString& aAPI,
|
|
const nsTArray<nsCString>& aTags,
|
|
UniquePtr<GetGMPContentParentCallback>&& aCallback)
|
|
: mNodeId(aNodeId),
|
|
mAPI(aAPI),
|
|
mTags(aTags),
|
|
mCallback(Move(aCallback))
|
|
{
|
|
}
|
|
|
|
virtual void Done(GMPServiceChild* aGMPServiceChild)
|
|
{
|
|
if (!aGMPServiceChild) {
|
|
mCallback->Done(nullptr);
|
|
return;
|
|
}
|
|
|
|
nsTArray<base::ProcessId> alreadyBridgedTo;
|
|
aGMPServiceChild->GetAlreadyBridgedTo(alreadyBridgedTo);
|
|
|
|
base::ProcessId otherProcess;
|
|
nsCString displayName;
|
|
uint32_t pluginId;
|
|
bool ok = aGMPServiceChild->SendLoadGMP(mNodeId, mAPI, mTags,
|
|
alreadyBridgedTo, &otherProcess,
|
|
&displayName, &pluginId);
|
|
if (!ok) {
|
|
mCallback->Done(nullptr);
|
|
return;
|
|
}
|
|
|
|
RefPtr<GMPContentParent> parent;
|
|
aGMPServiceChild->GetBridgedGMPContentParent(otherProcess,
|
|
getter_AddRefs(parent));
|
|
if (!alreadyBridgedTo.Contains(otherProcess)) {
|
|
parent->SetDisplayName(displayName);
|
|
parent->SetPluginId(pluginId);
|
|
}
|
|
|
|
mCallback->Done(parent);
|
|
}
|
|
|
|
private:
|
|
nsCString mNodeId;
|
|
nsCString mAPI;
|
|
const nsTArray<nsCString> mTags;
|
|
UniquePtr<GetGMPContentParentCallback> mCallback;
|
|
};
|
|
|
|
bool
|
|
GeckoMediaPluginServiceChild::GetContentParentFrom(const nsACString& aNodeId,
|
|
const nsCString& aAPI,
|
|
const nsTArray<nsCString>& aTags,
|
|
UniquePtr<GetGMPContentParentCallback>&& aCallback)
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread);
|
|
|
|
UniquePtr<GetServiceChildCallback> callback(
|
|
new GetContentParentFromDone(aNodeId, aAPI, aTags, Move(aCallback)));
|
|
GetServiceChild(Move(callback));
|
|
|
|
return true;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
GeckoMediaPluginServiceChild::GetPluginVersionForAPI(const nsACString& aAPI,
|
|
nsTArray<nsCString>* aTags,
|
|
bool* aHasPlugin,
|
|
nsACString& aOutVersion)
|
|
{
|
|
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
|
|
if (!contentChild) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
nsCString version;
|
|
bool ok = contentChild->SendGetGMPPluginVersionForAPI(nsCString(aAPI), *aTags,
|
|
aHasPlugin, &version);
|
|
aOutVersion = version;
|
|
return ok ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
class GetNodeIdDone : public GetServiceChildCallback
|
|
{
|
|
public:
|
|
GetNodeIdDone(const nsAString& aOrigin, const nsAString& aTopLevelOrigin,
|
|
const nsAString& aGMPName,
|
|
bool aInPrivateBrowsing, UniquePtr<GetNodeIdCallback>&& aCallback)
|
|
: mOrigin(aOrigin),
|
|
mTopLevelOrigin(aTopLevelOrigin),
|
|
mGMPName(aGMPName),
|
|
mInPrivateBrowsing(aInPrivateBrowsing),
|
|
mCallback(Move(aCallback))
|
|
{
|
|
}
|
|
|
|
virtual void Done(GMPServiceChild* aGMPServiceChild)
|
|
{
|
|
if (!aGMPServiceChild) {
|
|
mCallback->Done(NS_ERROR_FAILURE, EmptyCString());
|
|
return;
|
|
}
|
|
|
|
nsCString outId;
|
|
if (!aGMPServiceChild->SendGetGMPNodeId(mOrigin, mTopLevelOrigin,
|
|
mGMPName,
|
|
mInPrivateBrowsing, &outId)) {
|
|
mCallback->Done(NS_ERROR_FAILURE, EmptyCString());
|
|
return;
|
|
}
|
|
|
|
mCallback->Done(NS_OK, outId);
|
|
}
|
|
|
|
private:
|
|
nsString mOrigin;
|
|
nsString mTopLevelOrigin;
|
|
nsString mGMPName;
|
|
bool mInPrivateBrowsing;
|
|
UniquePtr<GetNodeIdCallback> mCallback;
|
|
};
|
|
|
|
NS_IMETHODIMP
|
|
GeckoMediaPluginServiceChild::GetNodeId(const nsAString& aOrigin,
|
|
const nsAString& aTopLevelOrigin,
|
|
const nsAString& aGMPName,
|
|
bool aInPrivateBrowsing,
|
|
UniquePtr<GetNodeIdCallback>&& aCallback)
|
|
{
|
|
UniquePtr<GetServiceChildCallback> callback(
|
|
new GetNodeIdDone(aOrigin, aTopLevelOrigin, aGMPName, aInPrivateBrowsing, Move(aCallback)));
|
|
GetServiceChild(Move(callback));
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
GeckoMediaPluginServiceChild::UpdateTrialCreateState(const nsAString& aKeySystem,
|
|
uint32_t aState)
|
|
{
|
|
if (NS_GetCurrentThread() != mGMPThread) {
|
|
mGMPThread->Dispatch(NS_NewRunnableMethodWithArgs<nsString, uint32_t>(
|
|
this, &GeckoMediaPluginServiceChild::UpdateTrialCreateState,
|
|
aKeySystem, aState), NS_DISPATCH_NORMAL);
|
|
return NS_OK;
|
|
}
|
|
|
|
class Callback : public GetServiceChildCallback
|
|
{
|
|
public:
|
|
Callback(const nsAString& aKeySystem, uint32_t aState)
|
|
: mKeySystem(aKeySystem)
|
|
, mState(aState)
|
|
{ }
|
|
|
|
virtual void Done(GMPServiceChild* aService) override
|
|
{
|
|
aService->SendUpdateGMPTrialCreateState(mKeySystem, mState);
|
|
}
|
|
|
|
private:
|
|
nsString mKeySystem;
|
|
uint32_t mState;
|
|
};
|
|
|
|
UniquePtr<GetServiceChildCallback> callback(new Callback(aKeySystem, aState));
|
|
GetServiceChild(Move(callback));
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
GeckoMediaPluginServiceChild::Observe(nsISupports* aSubject,
|
|
const char* aTopic,
|
|
const char16_t* aSomeData)
|
|
{
|
|
LOGD(("%s::%s: %s", __CLASS__, __FUNCTION__, aTopic));
|
|
if (!strcmp(NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, aTopic)) {
|
|
if (mServiceChild) {
|
|
mozilla::SyncRunnable::DispatchToThread(mGMPThread,
|
|
WrapRunnable(mServiceChild.get(),
|
|
&PGMPServiceChild::Close));
|
|
mServiceChild = nullptr;
|
|
}
|
|
ShutdownGMPThread();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
GeckoMediaPluginServiceChild::GetServiceChild(UniquePtr<GetServiceChildCallback>&& aCallback)
|
|
{
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
|
|
if (!mServiceChild) {
|
|
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
|
|
if (!contentChild) {
|
|
return;
|
|
}
|
|
mGetServiceChildCallbacks.AppendElement(Move(aCallback));
|
|
if (mGetServiceChildCallbacks.Length() == 1) {
|
|
NS_DispatchToMainThread(WrapRunnable(contentChild,
|
|
&dom::ContentChild::SendCreateGMPService));
|
|
}
|
|
return;
|
|
}
|
|
|
|
aCallback->Done(mServiceChild.get());
|
|
}
|
|
|
|
void
|
|
GeckoMediaPluginServiceChild::SetServiceChild(UniquePtr<GMPServiceChild>&& aServiceChild)
|
|
{
|
|
mServiceChild = Move(aServiceChild);
|
|
nsTArray<UniquePtr<GetServiceChildCallback>> getServiceChildCallbacks;
|
|
getServiceChildCallbacks.SwapElements(mGetServiceChildCallbacks);
|
|
for (uint32_t i = 0, length = getServiceChildCallbacks.Length(); i < length; ++i) {
|
|
getServiceChildCallbacks[i]->Done(mServiceChild.get());
|
|
}
|
|
}
|
|
|
|
void
|
|
GeckoMediaPluginServiceChild::RemoveGMPContentParent(GMPContentParent* aGMPContentParent)
|
|
{
|
|
if (mServiceChild) {
|
|
mServiceChild->RemoveGMPContentParent(aGMPContentParent);
|
|
}
|
|
}
|
|
|
|
GMPServiceChild::GMPServiceChild()
|
|
{
|
|
}
|
|
|
|
GMPServiceChild::~GMPServiceChild()
|
|
{
|
|
XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
|
|
new DeleteTask<Transport>(GetTransport()));
|
|
}
|
|
|
|
PGMPContentParent*
|
|
GMPServiceChild::AllocPGMPContentParent(Transport* aTransport,
|
|
ProcessId aOtherPid)
|
|
{
|
|
MOZ_ASSERT(!mContentParents.GetWeak(aOtherPid));
|
|
|
|
nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
|
|
MOZ_ASSERT(mainThread);
|
|
|
|
RefPtr<GMPContentParent> parent = new GMPContentParent();
|
|
|
|
DebugOnly<bool> ok = parent->Open(aTransport, aOtherPid,
|
|
XRE_GetIOMessageLoop(),
|
|
mozilla::ipc::ParentSide);
|
|
MOZ_ASSERT(ok);
|
|
|
|
mContentParents.Put(aOtherPid, parent);
|
|
return parent;
|
|
}
|
|
|
|
void
|
|
GMPServiceChild::GetBridgedGMPContentParent(ProcessId aOtherPid,
|
|
GMPContentParent** aGMPContentParent)
|
|
{
|
|
mContentParents.Get(aOtherPid, aGMPContentParent);
|
|
}
|
|
|
|
void
|
|
GMPServiceChild::RemoveGMPContentParent(GMPContentParent* aGMPContentParent)
|
|
{
|
|
for (auto iter = mContentParents.Iter(); !iter.Done(); iter.Next()) {
|
|
RefPtr<GMPContentParent>& parent = iter.Data();
|
|
if (parent == aGMPContentParent) {
|
|
iter.Remove();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
GMPServiceChild::GetAlreadyBridgedTo(nsTArray<base::ProcessId>& aAlreadyBridgedTo)
|
|
{
|
|
aAlreadyBridgedTo.SetCapacity(mContentParents.Count());
|
|
for (auto iter = mContentParents.Iter(); !iter.Done(); iter.Next()) {
|
|
const uint64_t& id = iter.Key();
|
|
aAlreadyBridgedTo.AppendElement(id);
|
|
}
|
|
}
|
|
|
|
class OpenPGMPServiceChild : public nsRunnable
|
|
{
|
|
public:
|
|
OpenPGMPServiceChild(UniquePtr<GMPServiceChild>&& aGMPServiceChild,
|
|
mozilla::ipc::Transport* aTransport,
|
|
base::ProcessId aOtherPid)
|
|
: mGMPServiceChild(Move(aGMPServiceChild)),
|
|
mTransport(aTransport),
|
|
mOtherPid(aOtherPid)
|
|
{
|
|
}
|
|
|
|
NS_IMETHOD Run()
|
|
{
|
|
RefPtr<GeckoMediaPluginServiceChild> gmp =
|
|
GeckoMediaPluginServiceChild::GetSingleton();
|
|
MOZ_ASSERT(!gmp->mServiceChild);
|
|
if (mGMPServiceChild->Open(mTransport, mOtherPid, XRE_GetIOMessageLoop(),
|
|
ipc::ChildSide)) {
|
|
gmp->SetServiceChild(Move(mGMPServiceChild));
|
|
} else {
|
|
gmp->SetServiceChild(nullptr);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
UniquePtr<GMPServiceChild> mGMPServiceChild;
|
|
mozilla::ipc::Transport* mTransport;
|
|
base::ProcessId mOtherPid;
|
|
};
|
|
|
|
/* static */
|
|
PGMPServiceChild*
|
|
GMPServiceChild::Create(Transport* aTransport, ProcessId aOtherPid)
|
|
{
|
|
RefPtr<GeckoMediaPluginServiceChild> gmp =
|
|
GeckoMediaPluginServiceChild::GetSingleton();
|
|
MOZ_ASSERT(!gmp->mServiceChild);
|
|
|
|
UniquePtr<GMPServiceChild> serviceChild(new GMPServiceChild());
|
|
|
|
nsCOMPtr<nsIThread> gmpThread;
|
|
nsresult rv = gmp->GetThread(getter_AddRefs(gmpThread));
|
|
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
|
|
GMPServiceChild* result = serviceChild.get();
|
|
rv = gmpThread->Dispatch(new OpenPGMPServiceChild(Move(serviceChild),
|
|
aTransport,
|
|
aOtherPid),
|
|
NS_DISPATCH_NORMAL);
|
|
if (NS_FAILED(rv)) {
|
|
return nullptr;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace gmp
|
|
} // namespace mozilla
|