wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset f41a2121425f (bug 1171931) for bustage

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-06-30 10:30:51 +02:00
parent 5607c34b3e
commit 947d340288
201 changed files with 579 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessible/base/nsAccessibilityService.cpp
View File

@ -1265,7 +1265,7 @@ nsAccessibilityService::Init()
logging::CheckEnv();
#endif
if (XRE_IsParentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Default)
gApplicationAccessible = new ApplicationAccessibleWrap();
else
gApplicationAccessible = new ApplicationAccessible();
@ -1286,7 +1286,7 @@ nsAccessibilityService::Init()
gIsShutdown = false;
// Now its safe to start platform accessibility.
if (XRE_IsParentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Default)
PlatformInit();
return true;
@ -1329,7 +1329,7 @@ nsAccessibilityService::Shutdown()
gIsShutdown = true;
if (XRE_IsParentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Default)
PlatformShutdown();
gApplicationAccessible->Shutdown();

2
accessible/base/nsAccessibilityService.h
View File

@ -282,7 +282,7 @@ IPCAccessibilityActive()
#ifdef MOZ_B2G
return false;
#else
return XRE_IsContentProcess() &&
return XRE_GetProcessType() == GeckoProcessType_Content &&
mozilla::Preferences::GetBool("accessibility.ipc_architecture.enabled", true);
#endif
}

2
accessible/base/nsCoreUtils.cpp
View File

@ -425,7 +425,7 @@ nsCoreUtils::IsTabDocument(nsIDocument* aDocumentNode)
treeItem->GetParent(getter_AddRefs(parentTreeItem));
// Tab document running in own process doesn't have parent.
if (XRE_IsContentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Content)
return !parentTreeItem;
// Parent of docshell for tab document running in chrome process is root.

2
accessible/windows/msaa/nsWinUtils.cpp
View File

@ -64,7 +64,7 @@ nsWinUtils::MaybeStartWindowEmulation()
if (Compatibility::IsJAWS() || Compatibility::IsWE() ||
Compatibility::IsDolphin() ||
XRE_IsContentProcess()) {
XRE_GetProcessType() == GeckoProcessType_Content) {
RegisterNativeWindow(kClassNameTabContent);
sHWNDCache = new nsRefPtrHashtable<nsPtrHashKey<void>, DocAccessible>(2);
return true;

12
caps/DomainPolicy.cpp
View File

@ -22,7 +22,7 @@ static nsresult
BroadcastDomainSetChange(DomainSetType aSetType, DomainSetChangeType aChangeType,
nsIURI* aDomain = nullptr)
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default,
"DomainPolicy should only be exposed to the chrome process.");
nsTArray<ContentParent*> parents;
@ -45,7 +45,7 @@ DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet(BLACKLIST))
, mWhitelist(new DomainSet(WHITELIST))
, mSuperWhitelist(new DomainSet(SUPER_WHITELIST))
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
BroadcastDomainSetChange(NO_TYPE, ACTIVATE_POLICY);
}
}
@ -112,7 +112,7 @@ DomainPolicy::Deactivate()
if (ssm) {
ssm->DeactivateDomainPolicy();
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
BroadcastDomainSetChange(NO_TYPE, DEACTIVATE_POLICY);
}
return NS_OK;
@ -170,7 +170,7 @@ DomainSet::Add(nsIURI* aDomain)
nsCOMPtr<nsIURI> clone = GetCanonicalClone(aDomain);
NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE);
mHashTable.PutEntry(clone);
if (XRE_IsParentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Default)
return BroadcastDomainSetChange(mType, ADD_DOMAIN, aDomain);
return NS_OK;
@ -182,7 +182,7 @@ DomainSet::Remove(nsIURI* aDomain)
nsCOMPtr<nsIURI> clone = GetCanonicalClone(aDomain);
NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE);
mHashTable.RemoveEntry(clone);
if (XRE_IsParentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Default)
return BroadcastDomainSetChange(mType, REMOVE_DOMAIN, aDomain);
return NS_OK;
@ -192,7 +192,7 @@ NS_IMETHODIMP
DomainSet::Clear()
{
mHashTable.Clear();
if (XRE_IsParentProcess())
if (XRE_GetProcessType() == GeckoProcessType_Default)
return BroadcastDomainSetChange(mType, CLEAR_DOMAINS);
return NS_OK;

4
caps/nsScriptSecurityManager.cpp
View File

@ -1283,7 +1283,7 @@ nsScriptSecurityManager::~nsScriptSecurityManager(void)
// ContentChild might hold a reference to the domain policy,
// and it might release it only after the security manager is
// gone. But we can still assert this for the main process.
MOZ_ASSERT_IF(XRE_IsParentProcess(),
MOZ_ASSERT_IF(XRE_GetProcessType() == GeckoProcessType_Default,
!mDomainPolicy);
}
@ -1500,7 +1500,7 @@ nsScriptSecurityManager::GetDomainPolicyActive(bool *aRv)
NS_IMETHODIMP
nsScriptSecurityManager::ActivateDomainPolicy(nsIDomainPolicy** aRv)
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return NS_ERROR_SERVICE_NOT_AVAILABLE;
}

2
docshell/base/nsDefaultURIFixup.cpp
View File

@ -416,7 +416,7 @@ nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
}
keyword.Trim(" ");
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (!contentChild) {
return NS_ERROR_NOT_AVAILABLE;

10
docshell/base/nsDocShell.cpp
View File

@ -824,7 +824,7 @@ IncreasePrivateDocShellCount()
{
gNumberOfPrivateDocShells++;
if (gNumberOfPrivateDocShells > 1 ||
!XRE_IsContentProcess()) {
XRE_GetProcessType() != GeckoProcessType_Content) {
return;
}
@ -838,7 +838,7 @@ DecreasePrivateDocShellCount()
MOZ_ASSERT(gNumberOfPrivateDocShells > 0);
gNumberOfPrivateDocShells--;
if (!gNumberOfPrivateDocShells) {
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
dom::ContentChild* cc = dom::ContentChild::GetSingleton();
cc->SendPrivateDocShellsExist(false);
return;
@ -5021,7 +5021,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
mInPrivateBrowsing ? nsISocketProvider::NO_PERMANENT_STORAGE : 0;
bool isStsHost = false;
bool isPinnedHost = false;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsISiteSecurityService> sss =
do_GetService(NS_SSSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -9449,7 +9449,7 @@ nsDocShell::CopyFavicon(nsIURI* aOldURI,
nsIURI* aNewURI,
bool aInPrivateBrowsing)
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
mozilla::ipc::URIParams oldURI, newURI;
@ -13992,7 +13992,7 @@ nsDocShell::MaybeNotifyKeywordSearchLoading(const nsString& aProvider,
return;
}
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
contentChild->SendNotifyKeywordSearchLoading(aProvider, aKeyword);

16
dom/asmjscache/AsmJSCache.cpp
View File

@ -59,6 +59,12 @@ namespace asmjscache {
namespace {
bool
IsMainProcess()
{
return XRE_GetProcessType() == GeckoProcessType_Default;
}
// Anything smaller should compile fast enough that caching will just add
// overhead.
static const size_t sMinCachedModuleLength = 10000;
@ -497,7 +503,7 @@ public:
mIsApp(false),
mEnforcingQuota(true)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(IsMainProcess());
}
virtual ~MainProcessRunnable()
@ -1127,7 +1133,7 @@ public:
: MainProcessRunnable(aPrincipal, aOpenMode, aWriteParams),
mReadParams(aReadParams)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(IsMainProcess());
MOZ_ASSERT(!NS_IsMainThread());
MOZ_COUNT_CTOR(SingleProcessRunnable);
}
@ -1205,7 +1211,7 @@ public:
mOpened(false),
mFinished(false)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(IsMainProcess());
MOZ_ASSERT(NS_IsMainThread());
MOZ_COUNT_CTOR(ParentProcessRunnable);
}
@ -1382,7 +1388,7 @@ public:
mActorDestroyed(false),
mState(eInitial)
{
MOZ_ASSERT(!XRE_IsParentProcess());
MOZ_ASSERT(!IsMainProcess());
MOZ_ASSERT(!NS_IsMainThread());
MOZ_COUNT_CTOR(ChildProcessRunnable);
}
@ -1578,7 +1584,7 @@ OpenFile(nsIPrincipal* aPrincipal,
// parent process to open the file and interact with the QuotaManager. The
// child can then map the file into its address space to perform I/O.
nsRefPtr<File> file;
if (XRE_IsParentProcess()) {
if (IsMainProcess()) {
file = new SingleProcessRunnable(aPrincipal, aOpenMode, aWriteParams,
aReadParams);
} else {

18
dom/audiochannel/AudioChannelService.cpp
View File

@ -70,7 +70,7 @@ AudioChannelService::GetAudioChannelService()
{
MOZ_ASSERT(NS_IsMainThread());
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return AudioChannelServiceChild::GetAudioChannelService();
}
@ -84,7 +84,7 @@ AudioChannelService::GetOrCreateAudioChannelService()
{
MOZ_ASSERT(NS_IsMainThread());
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return AudioChannelServiceChild::GetOrCreateAudioChannelService();
}
@ -104,7 +104,7 @@ AudioChannelService::GetOrCreateAudioChannelService()
void
AudioChannelService::Shutdown()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return AudioChannelServiceChild::Shutdown();
}
@ -122,7 +122,7 @@ AudioChannelService::AudioChannelService()
, mDisabled(false)
, mDefChannelChildID(CONTENT_PROCESS_ID_UNKNOWN)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
if (obs) {
obs->AddObserver(this, "ipc:content-shutdown", false);
@ -180,7 +180,7 @@ AudioChannelService::RegisterType(AudioChannel aChannel, uint64_t aChildID,
AudioChannelInternalType type = GetInternalType(aChannel, true);
mChannelCounters[type].AppendElement(aChildID);
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// We must keep the childIds in order to decide which app is allowed to play
// with then telephony channel.
@ -272,7 +272,7 @@ AudioChannelService::UnregisterType(AudioChannel aChannel,
// There are two reasons to defer the decrease of telephony channel.
// 1. User can have time to remove device from his ear before music resuming.
// 2. Give BT SCO to be disconnected before starting to connect A2DP.
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
if (aChannel == AudioChannel::Telephony) {
UnregisterTelephonyChild(aChildID);
@ -306,7 +306,7 @@ AudioChannelService::UnregisterTypeInternal(AudioChannel aChannel,
// In order to avoid race conditions, it's safer to notify any existing
// agent any time a new one is registered.
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// No hidden content channel is playable if the original playable hidden
// process does not need to play audio from background anymore.
if (aChannel == AudioChannel::Content &&
@ -547,7 +547,7 @@ AudioChannelService::SetDefaultVolumeControlChannelInternal(int32_t aChannel,
bool aVisible,
uint64_t aChildID)
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return;
}
@ -590,7 +590,7 @@ AudioChannelService::SetDefaultVolumeControlChannelInternal(int32_t aChannel,
void
AudioChannelService::SendAudioChannelChangedNotification(uint64_t aChildID)
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return;
}

2
dom/base/Crypto.cpp
View File

@ -91,7 +91,7 @@ Crypto::GetRandomValues(JSContext* aCx, const ArrayBufferView& aArray,
uint8_t* data = aArray.Data();
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
InfallibleTArray<uint8_t> randomValues;
// Tell the parent process to generate random values via PContent
ContentChild* cc = ContentChild::GetSingleton();

4
dom/base/Navigator.cpp
View File

@ -1481,7 +1481,7 @@ Navigator::GetFeature(const nsAString& aName, ErrorResult& aRv)
#if defined(XP_LINUX)
if (aName.EqualsLiteral("hardware.memory")) {
// with seccomp enabled, fopen() should be in a non-sandboxed process
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
uint32_t memLevel = mozilla::hal::GetTotalSystemMemoryLevel();
if (memLevel == 0) {
p->MaybeReject(NS_ERROR_NOT_AVAILABLE);
@ -2572,7 +2572,7 @@ Navigator::HasTVSupport(JSContext* aCx, JSObject* aGlobal)
bool
Navigator::IsE10sEnabled(JSContext* aCx, JSObject* aGlobal)
{
return XRE_IsContentProcess();
return XRE_GetProcessType() == GeckoProcessType_Content;
}
bool

2
dom/base/nsCCUncollectableMarker.cpp
View File

@ -140,7 +140,7 @@ static void
MarkMessageManagers()
{
// The global message manager only exists in the root process.
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return;
}
nsCOMPtr<nsIMessageBroadcaster> strongGlobalMM =

2
dom/base/nsContentPermissionHelper.cpp
View File

@ -336,7 +336,7 @@ nsContentPermissionUtils::AskPermission(nsIContentPermissionRequest* aRequest, n
NS_ENSURE_STATE(aWindow && aWindow->IsCurrentInnerWindow());
// for content process
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
nsRefPtr<RemotePermissionRequest> req =
new RemotePermissionRequest(aRequest, aWindow);

2
dom/base/nsDocument.cpp
View File

@ -10637,7 +10637,7 @@ PLDHashOperator UnlockEnumerator(imgIRequest* aKey,
nsresult
nsDocument::SetImageLockingState(bool aLocked)
{
if (XRE_IsContentProcess() &&
if (XRE_GetProcessType() == GeckoProcessType_Content &&
!Preferences::GetBool("image.mem.allow_locking_in_content_processes", true)) {
return NS_OK;
}

4
dom/base/nsFocusManager.cpp
View File

@ -697,7 +697,7 @@ nsFocusManager::WindowRaised(nsIDOMWindow* aWindow)
// If this is a parent or single process window, send the activate event.
// Events for child process windows will be sent when ParentActivated
// is called.
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
ActivateOrDeactivate(window, true);
}
@ -760,7 +760,7 @@ nsFocusManager::WindowLowered(nsIDOMWindow* aWindow)
// If this is a parent or single process window, send the deactivate event.
// Events for child process windows will be sent when ParentActivated
// is called.
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
ActivateOrDeactivate(window, false);
}

6
dom/base/nsFrameLoader.cpp
View File

@ -1601,12 +1601,12 @@ nsFrameLoader::ShouldUseRemoteProcess()
// Don't try to launch nested children if we don't have OMTC.
// They won't render!
if (XRE_IsContentProcess() &&
if (XRE_GetProcessType() == GeckoProcessType_Content &&
!CompositorChild::ChildProcessHasCompositor()) {
return false;
}
if (XRE_IsContentProcess() &&
if (XRE_GetProcessType() == GeckoProcessType_Content &&
!(PR_GetEnv("MOZ_NESTED_OOP_TABS") ||
Preferences::GetBool("dom.ipc.tabs.nested.enabled", false))) {
return false;
@ -2650,7 +2650,7 @@ nsFrameLoader::ResetPermissionManagerStatus()
{
// The resetting of the permissions status can run only
// in the main process.
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return;
}

8
dom/base/nsFrameMessageManager.cpp
View File

@ -902,7 +902,7 @@ nsFrameMessageManager::Dump(const nsAString& aStr)
NS_IMETHODIMP
nsFrameMessageManager::PrivateNoteIntentionalCrash()
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mozilla::NoteIntentionalCrash("tab");
return NS_OK;
} else {
@ -1576,7 +1576,7 @@ MessageManagerReporter::CollectReports(nsIMemoryReporterCallback* aCb,
{
nsresult rv;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsIMessageBroadcaster> globalmm =
do_GetService("@mozilla.org/globalmessagemanager;1");
if (globalmm) {
@ -1612,7 +1612,7 @@ MessageManagerReporter::CollectReports(nsIMemoryReporterCallback* aCb,
nsresult
NS_NewGlobalMessageManager(nsIMessageBroadcaster** aResult)
{
NS_ENSURE_TRUE(XRE_IsParentProcess(),
NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default,
NS_ERROR_NOT_AVAILABLE);
nsRefPtr<nsFrameMessageManager> mm = new nsFrameMessageManager(nullptr,
nullptr,
@ -2141,7 +2141,7 @@ NS_NewChildProcessMessageManager(nsISyncMessageSender** aResult)
"Re-creating sChildProcessManager");
MessageManagerCallback* cb;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
cb = new SameChildProcessMessageManagerCallback();
} else {
cb = new ChildProcessMessageManagerCallback();

4
dom/base/nsGlobalWindow.cpp
View File

@ -8987,7 +8987,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aUrl, nsIVariant* aArgument,
(aUrl, aArgument, aOptions, aError), aError,
nullptr);
if (!IsShowModalDialogEnabled() || XRE_IsContentProcess()) {
if (!IsShowModalDialogEnabled() || XRE_GetProcessType() == GeckoProcessType_Content) {
aError.Throw(NS_ERROR_NOT_AVAILABLE);
return nullptr;
}
@ -10776,7 +10776,7 @@ nsGlobalWindow::ShowSlowScriptDialog()
unsigned lineno;
bool hasFrame = JS::DescribeScriptedCaller(cx, &filename, &lineno);
if (XRE_IsContentProcess() &&
if (XRE_GetProcessType() == GeckoProcessType_Content &&
ProcessHangMonitor::Get()) {
ProcessHangMonitor::SlowScriptAction action;
nsRefPtr<ProcessHangMonitor> monitor = ProcessHangMonitor::Get();

2
dom/base/nsObjectLoadingContent.cpp
View File

@ -3199,7 +3199,7 @@ nsObjectLoadingContent::ShouldPlay(FallbackType &aReason, bool aIgnoreCurrentTyp
sPrefsInitialized = true;
}
if (XRE_IsParentProcess() &&
if (XRE_GetProcessType() == GeckoProcessType_Default &&
BrowserTabsRemoteAutostart()) {
// Plugins running OOP from the chrome process along with plugins running
// OOP from the content process will hang. Let's prevent that situation.

2
dom/base/nsWindowMemoryReporter.cpp
View File

@ -534,7 +534,7 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
// Collect window memory usage.
nsWindowSizes windowTotalSizes(nullptr);
nsCOMPtr<amIAddonManager> addonManager;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// Only try to access the service from the main process.
addonManager = do_GetService("@mozilla.org/addons/integration;1");
}

2
dom/base/nsXMLHttpRequest.cpp
View File

@ -2946,7 +2946,7 @@ nsXMLHttpRequest::Send(nsIVariant* aVariant, const Nullable<RequestBody>& aBody)
if (scheme.LowerCaseEqualsLiteral("app") ||
scheme.LowerCaseEqualsLiteral("jar")) {
mIsMappedArrayBuffer = true;
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
nsCOMPtr<nsIJARChannel> jarChannel = do_QueryInterface(mChannel);
// For memory mapping from child process, we need to get file
// descriptor of the JAR file opened remotely on the parent proess.

6
dom/bluetooth/BluetoothUtils.cpp
View File

@ -333,4 +333,10 @@ DispatchStatusChangedEvent(const nsAString& aType,
#endif
}
bool
IsMainProcess()
{
return XRE_GetProcessType() == GeckoProcessType_Default;
}
END_BLUETOOTH_NAMESPACE

8
dom/bluetooth/BluetoothUtils.h
View File

@ -157,6 +157,14 @@ DispatchStatusChangedEvent(const nsAString& aType,
const nsAString& aDeviceAddress,
bool aStatus);
/**
* Check whether the caller runs at B2G process.
*
* @return true if the caller runs at B2G process, false otherwise.
*/
bool
IsMainProcess();
END_BLUETOOTH_NAMESPACE
#endif

2
dom/bluetooth/bluetooth1/BluetoothAdapter.cpp
View File

@ -784,7 +784,7 @@ BluetoothAdapter::SendFile(const nsAString& aDeviceAddress,
return nullptr;
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// In-process transfer
bs->SendFile(aDeviceAddress, &aBlob, results);
} else {

10
dom/bluetooth/bluetooth1/BluetoothService.cpp
View File

@ -98,6 +98,12 @@ StaticRefPtr<BluetoothService> sBluetoothService;
bool sInShutdown = false;
bool sToggleInProgress = false;
bool
IsMainProcess()
{
return XRE_GetProcessType() == GeckoProcessType_Default;
}
void
ShutdownTimeExceeded(nsITimer* aTimer, void* aClosure)
{
@ -214,7 +220,7 @@ BluetoothService*
BluetoothService::Create()
{
#if defined(MOZ_B2G_BT)
if (!XRE_IsParentProcess()) {
if (!IsMainProcess()) {
return BluetoothServiceChildProcess::Create();
}
@ -248,7 +254,7 @@ BluetoothService::Init()
}
// Only the main process should observe bluetooth settings changes.
if (XRE_IsParentProcess() &&
if (IsMainProcess() &&
NS_FAILED(obs->AddObserver(this, MOZSETTINGS_CHANGED_ID, false))) {
BT_WARNING("Failed to add settings change observer!");
return false;

2
dom/bluetooth/bluetooth2/BluetoothAdapter.cpp
View File

@ -1298,7 +1298,7 @@ BluetoothAdapter::SendFile(const nsAString& aDeviceAddress,
return nullptr;
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// In-process transfer
bs->SendFile(aDeviceAddress, &aBlob, results);
} else {

6
dom/bluetooth/bluetooth2/BluetoothService.cpp
View File

@ -193,7 +193,7 @@ BluetoothService*
BluetoothService::Create()
{
#if defined(MOZ_B2G_BT)
if (!XRE_IsParentProcess()) {
if (!IsMainProcess()) {
return BluetoothServiceChildProcess::Create();
}
@ -227,7 +227,7 @@ BluetoothService::Init()
}
// Only the main process should observe bluetooth settings changes.
if (XRE_IsParentProcess() &&
if (IsMainProcess() &&
NS_FAILED(obs->AddObserver(this, MOZSETTINGS_CHANGED_ID, false))) {
BT_WARNING("Failed to add settings change observer!");
return false;
@ -269,7 +269,7 @@ BluetoothService::RegisterBluetoothSignalHandler(
// Distribute pending pairing requests when pairing listener has been added
// to signal observer table.
if (XRE_IsParentProcess() &&
if (IsMainProcess() &&
!mPendingPairReqSignals.IsEmpty() &&
aNodeName.EqualsLiteral(KEY_PAIRING_LISTENER)) {
for (uint32_t i = 0; i < mPendingPairReqSignals.Length(); ++i) {

2
dom/bluetooth/bluez/BluetoothHfpManager.cpp
View File

@ -443,7 +443,7 @@ bool
BluetoothHfpManager::Init()
{
// The function must run at b2g process since it would access SettingsService.
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(IsMainProcess());
MOZ_ASSERT(NS_IsMainThread());
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();

2
dom/cellbroadcast/CellBroadcast.cpp
View File

@ -152,7 +152,7 @@ NS_CreateCellBroadcastService()
{
nsCOMPtr<nsICellBroadcastService> service;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
service = new mozilla::dom::cellbroadcast::CellBroadcastIPCService();
#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
} else {

86
dom/datastore/DataStoreService.cpp
View File

@ -51,8 +51,8 @@
#include "nsXULAppAPI.h"
#define ASSERT_PARENT_PROCESS() \
MOZ_ASSERT(XRE_IsParentProcess()); \
if (NS_WARN_IF(!XRE_IsParentProcess())) { \
AssertIsInMainProcess(); \
if (NS_WARN_IF(!IsMainProcess())) { \
return NS_ERROR_FAILURE; \
}
@ -125,6 +125,20 @@ static uint64_t gCounterID = 0;
typedef nsClassHashtable<nsUint32HashKey, DataStoreInfo> HashApp;
bool
IsMainProcess()
{
static const bool isMainProcess =
XRE_GetProcessType() == GeckoProcessType_Default;
return isMainProcess;
}
void
AssertIsInMainProcess()
{
MOZ_ASSERT(IsMainProcess());
}
void
RejectPromise(nsPIDOMWindow* aWindow, Promise* aPromise, nsresult aRv)
{
@ -147,7 +161,8 @@ void
DeleteDatabase(const nsAString& aName,
const nsAString& aManifestURL)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<DataStoreDB> db = new DataStoreDB(aManifestURL, aName);
db->Delete();
@ -159,7 +174,8 @@ DeleteDataStoresAppEnumerator(
nsAutoPtr<DataStoreInfo>& aInfo,
void* aUserData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
auto* appId = static_cast<uint32_t*>(aUserData);
if (*appId != aAppId) {
@ -175,7 +191,8 @@ DeleteDataStoresEnumerator(const nsAString& aName,
nsAutoPtr<HashApp>& aApps,
void* aUserData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
aApps->Enumerate(DeleteDataStoresAppEnumerator, aUserData);
return aApps->Count() ? PL_DHASH_NEXT : PL_DHASH_REMOVE;
@ -198,7 +215,8 @@ ResetPermission(uint32_t aAppId, const nsAString& aOriginURL,
const nsAString& aPermission,
bool aReadOnly)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
nsresult rv;
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
@ -329,7 +347,8 @@ GetDataStoreInfosEnumerator(const uint32_t& aAppId,
DataStoreInfo* aInfo,
void* aUserData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
auto* data = static_cast<GetDataStoreInfosData*>(aUserData);
if (aAppId == data->mAppId) {
@ -365,7 +384,8 @@ GetAppManifestURLsEnumerator(const uint32_t& aAppId,
DataStoreInfo* aInfo,
void* aUserData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
auto* manifestURLs = static_cast<nsIMutableArray*>(aUserData);
nsCOMPtr<nsISupportsString> manifestURL(do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID));
@ -397,7 +417,8 @@ AddPermissionsEnumerator(const uint32_t& aAppId,
DataStoreInfo* aInfo,
void* userData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
auto* data = static_cast<AddPermissionsData*>(userData);
@ -436,7 +457,8 @@ AddAccessPermissionsEnumerator(const uint32_t& aAppId,
DataStoreInfo* aInfo,
void* userData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
auto* data = static_cast<AddAccessPermissionsData*>(userData);
@ -495,13 +517,15 @@ public:
, mName(aName)
, mManifestURL(aManifestURL)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
}
void
Run(const nsAString& aRevisionId)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<DataStoreService> service = DataStoreService::Get();
MOZ_ASSERT(service);
@ -529,13 +553,15 @@ public:
, mName(aName)
, mManifestURL(aManifestURL)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
}
void
Run(DataStoreDB* aDb, RunStatus aStatus) override
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aDb);
if (aStatus == Error) {
@ -616,7 +642,8 @@ public:
NS_IMETHOD
HandleEvent(nsIDOMEvent* aEvent) override
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<IDBRequest> request;
request.swap(mRequest);
@ -803,7 +830,7 @@ DataStoreService::Shutdown()
MOZ_ASSERT(NS_IsMainThread());
if (gDataStoreService) {
if (XRE_IsParentProcess()) {
if (IsMainProcess()) {
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
if (obs) {
obs->RemoveObserver(gDataStoreService, "webapps-clear-data");
@ -836,7 +863,7 @@ DataStoreService::~DataStoreService()
nsresult
DataStoreService::Init()
{
if (!XRE_IsParentProcess()) {
if (!IsMainProcess()) {
return NS_OK;
}
@ -946,7 +973,7 @@ DataStoreService::GetDataStores(nsIDOMWindow* aWindow,
// If this request comes from the main process, we have access to the
// window, so we can skip the ipc communication.
if (XRE_IsParentProcess()) {
if (IsMainProcess()) {
uint32_t appId;
nsresult rv = principal->GetAppId(&appId);
if (NS_FAILED(rv)) {
@ -1105,7 +1132,8 @@ DataStoreService::GetDataStoreInfos(const nsAString& aName,
nsIPrincipal* aPrincipal,
nsTArray<DataStoreInfo>& aStores)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
nsCOMPtr<nsIAppsService> appsService =
do_GetService("@mozilla.org/AppsService;1");
@ -1214,7 +1242,8 @@ DataStoreService::CheckPermission(nsIPrincipal* aPrincipal,
void
DataStoreService::DeleteDataStores(uint32_t aAppId)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
mStores.Enumerate(DeleteDataStoresEnumerator, &aAppId);
mAccessStores.Enumerate(DeleteDataStoresEnumerator, &aAppId);
@ -1225,7 +1254,8 @@ DataStoreService::Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
if (strcmp(aTopic, "webapps-clear-data")) {
return NS_OK;
@ -1264,7 +1294,8 @@ DataStoreService::AddPermissions(uint32_t aAppId,
const nsAString& aManifestURL,
bool aReadOnly)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
// This is the permission name.
nsString permission;
@ -1296,7 +1327,8 @@ DataStoreService::AddAccessPermissions(uint32_t aAppId, const nsAString& aName,
const nsAString& aManifestURL,
bool aReadOnly)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
// When an app wants to have access to a DataStore, the permissions must be
// set.
@ -1317,7 +1349,8 @@ DataStoreService::CreateFirstRevisionId(uint32_t aAppId,
const nsAString& aName,
const nsAString& aManifestURL)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
AssertIsInMainProcess();
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<DataStoreDB> db = new DataStoreDB(aManifestURL, aName);
@ -1347,7 +1380,7 @@ DataStoreService::EnableDataStore(uint32_t aAppId, const nsAString& aName,
}
// Notify the child processes.
if (XRE_IsParentProcess()) {
if (IsMainProcess()) {
nsTArray<ContentParent*> children;
ContentParent::GetAll(children);
for (uint32_t i = 0; i < children.Length(); i++) {
@ -1414,7 +1447,8 @@ DataStoreService::GetDataStoresFromIPC(const nsAString& aName,
nsIPrincipal* aPrincipal,
nsTArray<DataStoreSetting>* aValue)
{
MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
MOZ_ASSERT(IsMainProcess());
MOZ_ASSERT(NS_IsMainThread());
uint32_t appId;
nsresult rv = aPrincipal->GetAppId(&appId);

36
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -561,7 +561,7 @@ FileUpdateDispatcher::Observe(nsISupports* aSubject,
return NS_OK;
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
// Child process. Forward the notification to the parent.
ContentChild::GetSingleton()
->SendFilePathUpdateNotify(dsf->mStorageType,
@ -692,7 +692,7 @@ DeviceStorageFile::Dump(const char* label)
path = NS_LITERAL_STRING("(null)");
}
const char* ptStr;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
ptStr = "parent";
} else {
ptStr = "child";
@ -814,7 +814,7 @@ OverrideRootDir::Init()
}
if (sDirs->overrideRootDir) {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// Only the parent process can create directories. In testing, because
// the preference is updated after startup, its entirely possible that
// the preference updated notification will be received by a child
@ -936,7 +936,7 @@ InitDirs()
}
#endif
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
NS_GetSpecialDirectory("UAppData", getter_AddRefs(sDirs->crashes));
if (sDirs->crashes) {
sDirs->crashes->Append(NS_LITERAL_STRING("Crash Reports"));
@ -2058,7 +2058,7 @@ ContinueCursorEvent::~ContinueCursorEvent() {}
void
ContinueCursorEvent::Continue()
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
DebugOnly<nsresult> rv = NS_DispatchToMainThread(this);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return;
@ -2244,7 +2244,7 @@ nsDOMDeviceStorageCursor::Allow(JS::HandleValue aChoices)
return NS_DispatchToMainThread(r);
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(this, mFile);
DeviceStorageEnumerationParams params(mFile->mStorageType,
@ -3013,7 +3013,7 @@ public:
return NS_DispatchToCurrentThread(r);
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
DeviceStorageCreateFdParams params;
params.type() = mFile->mStorageType;
@ -3053,7 +3053,7 @@ public:
return NS_DispatchToCurrentThread(r);
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
BlobChild* actor
= ContentChild::GetSingleton()->GetOrCreateActorForBlob(
static_cast<Blob*>(mBlob.get()));
@ -3099,7 +3099,7 @@ public:
return NS_DispatchToCurrentThread(r);
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
BlobChild* actor
= ContentChild::GetSingleton()->GetOrCreateActorForBlob(
static_cast<Blob*>(mBlob.get()));
@ -3145,7 +3145,7 @@ public:
return NS_DispatchToCurrentThread(r);
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageGetParams params(mFile->mStorageType,
@ -3179,7 +3179,7 @@ public:
return NS_DispatchToCurrentThread(r);
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageDeleteParams params(mFile->mStorageType,
@ -3195,7 +3195,7 @@ public:
case DEVICE_STORAGE_REQUEST_FREE_SPACE:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageFreeSpaceParams params(mFile->mStorageType,
@ -3210,7 +3210,7 @@ public:
case DEVICE_STORAGE_REQUEST_USED_SPACE:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageUsedSpaceParams params(mFile->mStorageType,
@ -3231,7 +3231,7 @@ public:
case DEVICE_STORAGE_REQUEST_AVAILABLE:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageAvailableParams params(mFile->mStorageType,
@ -3246,7 +3246,7 @@ public:
case DEVICE_STORAGE_REQUEST_STATUS:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageStatusParams params(mFile->mStorageType,
@ -3267,7 +3267,7 @@ public:
case DEVICE_STORAGE_REQUEST_FORMAT:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageFormatParams params(mFile->mStorageType,
@ -3282,7 +3282,7 @@ public:
case DEVICE_STORAGE_REQUEST_MOUNT:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageMountParams params(mFile->mStorageType,
@ -3297,7 +3297,7 @@ public:
case DEVICE_STORAGE_REQUEST_UNMOUNT:
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
PDeviceStorageRequestChild* child
= new DeviceStorageRequestChild(mRequest, mFile);
DeviceStorageUnmountParams params(mFile->mStorageType,

2
dom/events/EventStateManager.cpp
View File

@ -597,7 +597,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
// window edge) wont update the cursor if the cached value and the current
// cursor match. So when the mouse exits a remote frame, clear the cached
// widget cursor so a proper update will occur when the mouse re-enters.
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ClearCachedWidgetCursor(mCurrentTarget);
}

2
dom/events/IMEStateManager.cpp
View File

@ -932,7 +932,7 @@ IMEStateManager::SetIMEState(const IMEState& aState,
// XXX I think that we should use nsContentUtils::IsCallerChrome() instead
// of the process type.
if (aAction.mCause == InputContextAction::CAUSE_UNKNOWN &&
!XRE_IsContentProcess()) {
XRE_GetProcessType() != GeckoProcessType_Content) {
aAction.mCause = InputContextAction::CAUSE_UNKNOWN_CHROME;
}

2
dom/filehandle/FileStreamWrappers.cpp
View File

@ -242,7 +242,7 @@ void
FileInputStreamWrapper::Serialize(InputStreamParams& aParams,
FileDescriptorArray& /* aFDs */)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
nsCOMPtr<nsIInputStream> thisStream = do_QueryObject(this);

4
dom/filesystem/CreateDirectoryTask.cpp
View File

@ -39,7 +39,7 @@ CreateDirectoryTask::CreateDirectoryTask(
FileSystemRequestParent* aParent)
: FileSystemTaskBase(aFileSystem, aParam, aParent)
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
MOZ_ASSERT(aFileSystem);
@ -84,7 +84,7 @@ CreateDirectoryTask::SetSuccessRequestResult(const FileSystemResponseValue& aVal
nsresult
CreateDirectoryTask::Work()
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(!NS_IsMainThread(), "Only call on worker thread!");

8
dom/filesystem/CreateFileTask.cpp
View File

@ -39,7 +39,7 @@ CreateFileTask::CreateFileTask(FileSystemBase* aFileSystem,
MOZ_ASSERT(aFileSystem);
GetOutputBufferSize();
if (aBlobData) {
if (XRE_IsParentProcess()) {
if (FileSystemUtils::IsParentProcess()) {
aBlobData->GetInternalStream(getter_AddRefs(mBlobStream), aRv);
NS_WARN_IF(aRv.Failed());
} else {
@ -61,7 +61,7 @@ CreateFileTask::CreateFileTask(FileSystemBase* aFileSystem,
: FileSystemTaskBase(aFileSystem, aParam, aParent)
, mReplace(false)
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
MOZ_ASSERT(aFileSystem);
@ -168,7 +168,7 @@ CreateFileTask::Work()
nsCOMPtr<nsIOutputStream> mStream;
};
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(!NS_IsMainThread(), "Only call on worker thread!");
@ -324,7 +324,7 @@ CreateFileTask::GetPermissionAccessType(nsCString& aAccess) const
void
CreateFileTask::GetOutputBufferSize() const
{
if (sOutputBufferSize || !XRE_IsParentProcess()) {
if (sOutputBufferSize || !FileSystemUtils::IsParentProcess()) {
return;
}
sOutputBufferSize =

8
dom/filesystem/DeviceStorageFileSystem.cpp
View File

@ -47,7 +47,7 @@ DeviceStorageFileSystem::DeviceStorageFileSystem(
// Get the local path of the file system root.
// Since the child process is not allowed to access the file system, we only
// do this from the parent process.
if (!XRE_IsParentProcess()) {
if (!FileSystemUtils::IsParentProcess()) {
return;
}
nsCOMPtr<nsIFile> rootFile;
@ -100,7 +100,7 @@ DeviceStorageFileSystem::GetWindow() const
already_AddRefed<nsIFile>
DeviceStorageFileSystem::GetLocalFile(const nsAString& aRealPath) const
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Should be on parent process!");
nsAutoString localPath;
FileSystemUtils::NormalizedPathToLocalPath(aRealPath, localPath);
@ -116,7 +116,7 @@ DeviceStorageFileSystem::GetLocalFile(const nsAString& aRealPath) const
bool
DeviceStorageFileSystem::GetRealPath(BlobImpl* aFile, nsAString& aRealPath) const
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Should be on parent process!");
MOZ_ASSERT(aFile, "aFile Should not be null.");
@ -141,7 +141,7 @@ DeviceStorageFileSystem::GetRootName() const
bool
DeviceStorageFileSystem::IsSafeFile(nsIFile* aFile) const
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Should be on parent process!");
MOZ_ASSERT(aFile);

10
dom/filesystem/FileSystemTaskBase.cpp
View File

@ -35,7 +35,7 @@ FileSystemTaskBase::FileSystemTaskBase(FileSystemBase* aFileSystem,
, mFileSystem(aFileSystem)
, mRequestParent(aParent)
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
MOZ_ASSERT(aFileSystem, "aFileSystem should not be null.");
@ -61,7 +61,7 @@ FileSystemTaskBase::Start()
return;
}
if (XRE_IsParentProcess()) {
if (FileSystemUtils::IsParentProcess()) {
// Run in parent process.
// Start worker thread.
nsCOMPtr<nsIEventTarget> target
@ -121,7 +121,7 @@ FileSystemTaskBase::HandleResult()
FileSystemResponseValue
FileSystemTaskBase::GetRequestResult() const
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
if (HasError()) {
@ -134,7 +134,7 @@ FileSystemTaskBase::GetRequestResult() const
void
FileSystemTaskBase::SetRequestResult(const FileSystemResponseValue& aValue)
{
MOZ_ASSERT(!XRE_IsParentProcess(),
MOZ_ASSERT(!FileSystemUtils::IsParentProcess(),
"Only call from child process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
if (aValue.type() == FileSystemResponseValue::TFileSystemErrorResponse) {
@ -156,7 +156,7 @@ FileSystemTaskBase::Recv__delete__(const FileSystemResponseValue& aValue)
BlobParent*
FileSystemTaskBase::GetBlobParent(BlobImpl* aFile) const
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
MOZ_ASSERT(aFile);

7
dom/filesystem/FileSystemUtils.cpp
View File

@ -65,5 +65,12 @@ FileSystemUtils::IsDescendantPath(const nsAString& aPath,
return true;
}
// static
bool
FileSystemUtils::IsParentProcess()
{
return XRE_GetProcessType() == GeckoProcessType_Default;
}
} // namespace dom
} // namespace mozilla

3
dom/filesystem/FileSystemUtils.h
View File

@ -41,6 +41,9 @@ public:
static bool
IsDescendantPath(const nsAString& aPath, const nsAString& aDescendantPath);
static bool
IsParentProcess();
static const char16_t kSeparatorChar = char16_t('/');
};

4
dom/filesystem/GetFileOrDirectoryTask.cpp
View File

@ -47,7 +47,7 @@ GetFileOrDirectoryTask::GetFileOrDirectoryTask(
: FileSystemTaskBase(aFileSystem, aParam, aParent)
, mIsDirectory(false)
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
MOZ_ASSERT(aFileSystem);
@ -119,7 +119,7 @@ GetFileOrDirectoryTask::SetSuccessRequestResult(const FileSystemResponseValue& a
nsresult
GetFileOrDirectoryTask::Work()
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(!NS_IsMainThread(), "Only call on worker thread!");

4
dom/filesystem/RemoveTask.cpp
View File

@ -49,7 +49,7 @@ RemoveTask::RemoveTask(FileSystemBase* aFileSystem,
, mRecursive(false)
, mReturnValue(false)
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
MOZ_ASSERT(aFileSystem);
@ -123,7 +123,7 @@ RemoveTask::SetSuccessRequestResult(const FileSystemResponseValue& aValue)
nsresult
RemoveTask::Work()
{
MOZ_ASSERT(XRE_IsParentProcess(),
MOZ_ASSERT(FileSystemUtils::IsParentProcess(),
"Only call from parent process!");
MOZ_ASSERT(!NS_IsMainThread(), "Only call on worker thread!");

4
dom/fmradio/FMRadioService.cpp
View File

@ -42,7 +42,7 @@ BEGIN_FMRADIO_NAMESPACE
IFMRadioService*
IFMRadioService::Singleton()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return FMRadioChild::Singleton();
} else {
return FMRadioService::Singleton();
@ -1243,7 +1243,7 @@ FMRadioService::UpdateFrequency()
FMRadioService*
FMRadioService::Singleton()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
if (!sFMRadioService) {

2
dom/fmradio/ipc/FMRadioChild.cpp
View File

@ -338,7 +338,7 @@ FMRadioChild::EnableAudio(bool aAudioEnabled)
FMRadioChild*
FMRadioChild::Singleton()
{
MOZ_ASSERT(!XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
if (!sFMRadioChild) {

14
dom/gamepad/GamepadFunctions.cpp
View File

@ -24,7 +24,7 @@ void
NotifyGamepadChange(const T& aInfo)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
GamepadChangeEvent e(aInfo);
nsTArray<ContentParent*> t;
ContentParent::GetAll(t);
@ -44,7 +44,7 @@ AddGamepad(const char* aID,
uint32_t aNumButtons, uint32_t aNumAxes)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
int index = gGamepadIndex;
gGamepadIndex++;
@ -59,7 +59,7 @@ void
RemoveGamepad(uint32_t aIndex)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
GamepadRemoved a(aIndex);
NotifyGamepadChange<GamepadRemoved>(a);
}
@ -69,7 +69,7 @@ NewButtonEvent(uint32_t aIndex, uint32_t aButton,
bool aPressed, double aValue)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
GamepadButtonInformation a(aIndex, aButton, aPressed, aValue);
NotifyGamepadChange<GamepadButtonInformation>(a);
}
@ -79,7 +79,7 @@ NewButtonEvent(uint32_t aIndex, uint32_t aButton,
bool aPressed)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
// When only a digital button is available the value will be synthesized.
NewButtonEvent(aIndex, aButton, aPressed, aPressed ? 1.0L : 0.0L);
}
@ -89,7 +89,7 @@ NewAxisMoveEvent(uint32_t aIndex, uint32_t aAxis,
double aValue)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
GamepadAxisInformation a(aIndex, aAxis, aValue);
NotifyGamepadChange<GamepadAxisInformation>(a);
}
@ -98,7 +98,7 @@ void
ResetGamepadIndexes()
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
gGamepadIndex = 0;
}

2
dom/gamepad/GamepadMonitoring.cpp
View File

@ -17,7 +17,7 @@ void
MaybeStopGamepadMonitoring()
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
nsTArray<ContentParent*> t;
ContentParent::GetAll(t);
for(uint32_t i = 0; i < t.Length(); ++i) {

6
dom/gamepad/GamepadService.cpp
View File

@ -85,7 +85,7 @@ GamepadService::BeginShutdown()
mTimer->Cancel();
}
if (mStarted) {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
MaybeStopGamepadMonitoring();
} else {
ContentChild::GetSingleton()->SendGamepadListenerRemoved();
@ -115,7 +115,7 @@ GamepadService::AddListener(nsGlobalWindow* aWindow)
}
if (!mStarted && mEnabled) {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
StartGamepadMonitoring();
} else {
ContentChild::GetSingleton()->SendGamepadListenerAdded();
@ -500,7 +500,7 @@ GamepadService::TimeoutHandler(nsITimer* aTimer, void* aClosure)
}
if (self->mListeners.Length() == 0) {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
MaybeStopGamepadMonitoring();
} else {
ContentChild::GetSingleton()->SendGamepadListenerRemoved();

10
dom/geolocation/nsGeolocation.cpp
View File

@ -564,7 +564,7 @@ already_AddRefed<nsIDOMGeoPosition>
nsGeolocationRequest::AdjustedLocation(nsIDOMGeoPosition *aPosition)
{
nsCOMPtr<nsIDOMGeoPosition> pos = aPosition;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
GPSLOG("child process just copying position");
return pos.forget();
}
@ -758,7 +758,7 @@ nsresult nsGeolocationService::Init()
return NS_ERROR_FAILURE;
}
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
sGeoInitPending = false;
return NS_OK;
}
@ -1013,7 +1013,7 @@ nsGeolocationService::StartDevice(nsIPrincipal *aPrincipal)
// inactivivity
SetDisconnectTimer();
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cpc = ContentChild::GetSingleton();
cpc->SendAddGeolocationListener(IPC::Principal(aPrincipal),
HighAccuracyRequested());
@ -1076,7 +1076,7 @@ nsGeolocationService::UpdateAccuracy(bool aForceHigh)
{
bool highRequired = aForceHigh || HighAccuracyRequested();
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cpc = ContentChild::GetSingleton();
if (cpc->IsAlive()) {
cpc->SendSetGeolocationHigherAccuracy(highRequired);
@ -1103,7 +1103,7 @@ nsGeolocationService::StopDevice()
mDisconnectTimer = nullptr;
}
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cpc = ContentChild::GetSingleton();
cpc->SendRemoveGeolocationListener();
return; // bail early

2
dom/geolocation/nsGeolocationSettings.cpp
View File

@ -49,7 +49,7 @@ already_AddRefed<nsGeolocationSettings>
nsGeolocationSettings::GetGeolocationSettings()
{
// this singleton is only needed in the parent process...
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return nullptr;
}

6
dom/html/HTMLInputElement.cpp
View File

@ -746,7 +746,7 @@ UploadLastDir::FetchDirectoryAndDisplayPicker(nsIDocument* aDoc,
new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback);
#ifdef MOZ_B2G
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
prefCallback->HandleCompletion(nsIContentPrefCallback2::COMPLETE_ERROR);
return NS_OK;
}
@ -777,7 +777,7 @@ UploadLastDir::StoreLastUsedDirectory(nsIDocument* aDoc, nsIFile* aDir)
}
#ifdef MOZ_B2G
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return NS_OK;
}
#endif
@ -2105,7 +2105,7 @@ HTMLInputElement::MozSetFileArray(const Sequence<OwningNonNull<File>>& aFiles)
void
HTMLInputElement::MozSetFileNameArray(const Sequence< nsString >& aFileNames, ErrorResult& aRv)
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return;
}

2
dom/html/nsGenericHTMLFrameElement.cpp
View File

@ -596,7 +596,7 @@ nsGenericHTMLFrameElement::GetAppManifestURL(nsAString& aOut)
// Only allow content process to embed an app when nested content
// process is enabled.
if (!XRE_IsParentProcess() &&
if (XRE_GetProcessType() != GeckoProcessType_Default &&
!(GetBoolAttr(nsGkAtoms::Remote) && NestedEnabled())){
NS_WARNING("Can't embed-apps. Embed-apps is restricted to in-proc apps "
"or content processes with nested pref enabled, see bug 1097479");

2
dom/icc/IccManager.cpp
View File

@ -143,7 +143,7 @@ NS_CreateIccService()
{
nsCOMPtr<nsIIccService> service;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
service = new mozilla::dom::icc::IccIPCService();
#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
} else {

8
dom/indexedDB/ActorsChild.cpp
View File

@ -818,7 +818,7 @@ public:
: PermissionRequestBase(aElement, aPrincipal)
, mChallenge(aChallenge)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aChallenge);
}
@ -844,7 +844,7 @@ public:
WorkerPermissionChallenge* aChallenge)
: mChallenge(aChallenge)
{
MOZ_ASSERT(!XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aChallenge);
}
@ -950,7 +950,7 @@ private:
return true;
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<Element> ownerElement =
do_QueryInterface(window->GetChromeEventHandler());
if (NS_WARN_IF(!ownerElement)) {
@ -1399,7 +1399,7 @@ BackgroundFactoryRequestChild::RecvPermissionChallenge(
return false;
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsPIDOMWindow> window = mFactory->GetParentObject();
MOZ_ASSERT(window);

2
dom/indexedDB/FileSnapshot.cpp
View File

@ -82,7 +82,7 @@ BlobImplSnapshot::~BlobImplSnapshot()
void
BlobImplSnapshot::AssertSanity()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
}

4
dom/indexedDB/IndexedDatabaseManager.cpp
View File

@ -252,7 +252,7 @@ IndexedDatabaseManager::GetOrCreate()
}
if (!gDBManager) {
sIsMainProcess = XRE_IsParentProcess();
sIsMainProcess = XRE_GetProcessType() == GeckoProcessType_Default;
if (!sLoggingModule) {
sLoggingModule = PR_NewLogModule("IndexedDB");
@ -598,7 +598,7 @@ IndexedDatabaseManager::IsMainProcess()
{
NS_ASSERTION(gDBManager,
"IsMainProcess() called before indexedDB has been initialized!");
NS_ASSERTION((XRE_IsParentProcess()) ==
NS_ASSERTION((XRE_GetProcessType() == GeckoProcessType_Default) ==
sIsMainProcess, "XRE_GetProcessType changed its tune!");
return sIsMainProcess;
}

2
dom/indexedDB/PermissionRequestBase.cpp
View File

@ -43,7 +43,7 @@ const uint32_t kPermissionDefault = nsIPermissionManager::UNKNOWN_ACTION;
void
AssertSanity()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
}

4
dom/ipc/Blob.cpp
View File

@ -3250,7 +3250,7 @@ BlobChild::AssertIsOnOwningThread() const
void
BlobChild::Startup(const FriendKey& /* aKey */)
{
MOZ_ASSERT(!XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default);
CommonStartup();
}
@ -3773,7 +3773,7 @@ BlobParent::AssertIsOnOwningThread() const
void
BlobParent::Startup(const FriendKey& /* aKey */)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
CommonStartup();

2
dom/ipc/ContentChild.cpp
View File

@ -2830,7 +2830,7 @@ uint64_t
NextWindowID()
{
uint64_t processID = 0;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cc = ContentChild::GetSingleton();
processID = cc->GetID();
}

14
dom/ipc/ContentParent.cpp
View File

@ -778,7 +778,7 @@ ContentParent::StartUp()
// child process
sCanLaunchSubprocesses = true;
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return;
}
@ -1152,7 +1152,7 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext,
}
ProcessPriority initialPriority = GetInitialProcessPriority(aFrameElement);
bool isInContentProcess = !XRE_IsParentProcess();
bool isInContentProcess = (XRE_GetProcessType() != GeckoProcessType_Default);
TabId tabId;
nsIDocShell* docShell = GetOpenerDocShellHelper(aFrameElement);
@ -1811,7 +1811,7 @@ ContentParent::OnChannelError()
void
ContentParent::OnBeginSyncTransaction() {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsIConsoleService> console(do_GetService(NS_CONSOLESERVICE_CONTRACTID));
JSContext *cx = nsContentUtils::GetCurrentJSContext();
if (!sDisableUnsafeCPOWWarnings) {
@ -4875,7 +4875,7 @@ ContentParent::AllocateTabId(const TabId& aOpenerTabId,
const ContentParentId& aCpId)
{
TabId tabId;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
ContentProcessManager *cpm = ContentProcessManager::GetSingleton();
tabId = cpm->AllocateTabId(aOpenerTabId, aContext, aCpId);
}
@ -4892,7 +4892,7 @@ ContentParent::AllocateTabId(const TabId& aOpenerTabId,
ContentParent::DeallocateTabId(const TabId& aTabId,
const ContentParentId& aCpId)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
ContentProcessManager::GetSingleton()->DeallocateTabId(aCpId,
aTabId);
}
@ -5091,7 +5091,7 @@ ContentParent::DeallocPContentPermissionRequestParent(PContentPermissionRequestP
bool
ContentParent::RecvGetBrowserConfiguration(const nsCString& aURI, BrowserConfiguration* aConfig)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
return GetBrowserConfiguration(aURI, *aConfig);;
}
@ -5099,7 +5099,7 @@ ContentParent::RecvGetBrowserConfiguration(const nsCString& aURI, BrowserConfigu
/*static*/ bool
ContentParent::GetBrowserConfiguration(const nsCString& aURI, BrowserConfiguration& aConfig)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsRefPtr<ServiceWorkerRegistrar> swr = ServiceWorkerRegistrar::Get();
MOZ_ASSERT(swr);

2
dom/ipc/ContentProcessManager.cpp
View File

@ -32,7 +32,7 @@ ContentProcessManager::sSingleton;
/* static */ ContentProcessManager*
ContentProcessManager::GetSingleton()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
if (!sSingleton) {
sSingleton = new ContentProcessManager();

2
dom/ipc/ProcessHangMonitor.cpp
View File

@ -887,7 +887,7 @@ ProcessHangMonitor::ProcessHangMonitor()
MOZ_COUNT_CTOR(ProcessHangMonitor);
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
obs->AddObserver(this, "xpcom-shutdown", false);
}

16
dom/ipc/ProcessPriorityManager.cpp
View File

@ -384,7 +384,7 @@ ProcessPriorityManagerImpl::StaticInit()
}
// The process priority manager is main-process only.
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
sInitialized = true;
return;
}
@ -427,7 +427,7 @@ ProcessPriorityManagerImpl::ProcessPriorityManagerImpl()
, mBackgroundLRUPool(PROCESS_PRIORITY_BACKGROUND)
, mBackgroundPerceivableLRUPool(PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
RegisterWakeLockObserver(this);
}
@ -660,7 +660,7 @@ ParticularProcessPriorityManager::ParticularProcessPriorityManager(
, mIsActivityOpener(false)
, mFrozen(aFrozen)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
LOGP("Creating ParticularProcessPriorityManager.");
}
@ -826,7 +826,7 @@ ParticularProcessPriorityManager::OnRemoteBrowserFrameShown(nsISupports* aSubjec
TabParent* tp = TabParent::GetFrom(fl);
NS_ENSURE_TRUE_VOID(tp);
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
if (tp->Manager() != mContentParent) {
return;
}
@ -850,7 +850,7 @@ ParticularProcessPriorityManager::OnTabParentDestroyed(nsISupports* aSubject)
nsCOMPtr<nsITabParent> tp = do_QueryInterface(aSubject);
NS_ENSURE_TRUE_VOID(tp);
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
if (TabParent::GetFrom(tp)->Manager() != mContentParent) {
return;
}
@ -873,7 +873,7 @@ ParticularProcessPriorityManager::OnFrameloaderVisibleChanged(nsISupports* aSubj
return;
}
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
if (tp->Manager() != mContentParent) {
return;
}
@ -1213,7 +1213,7 @@ NS_IMPL_ISUPPORTS(ProcessPriorityManagerChild,
ProcessPriorityManagerChild::ProcessPriorityManagerChild()
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
mCachedPriority = PROCESS_PRIORITY_MASTER;
} else {
mCachedPriority = PROCESS_PRIORITY_UNKNOWN;
@ -1225,7 +1225,7 @@ ProcessPriorityManagerChild::Init()
{
// The process priority should only be changed in child processes; don't even
// bother listening for changes if we're in the main process.
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
nsCOMPtr<nsIObserverService> os = services::GetObserverService();
NS_ENSURE_TRUE_VOID(os);
os->AddObserver(this, "ipc:process-priority-changed", /* weak = */ false);

4
dom/ipc/TabParent.cpp
View File

@ -448,7 +448,7 @@ TabParent::Destroy()
}
mIsDestroyed = true;
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
Manager()->AsContentParent()->NotifyTabDestroying(this);
}
@ -466,7 +466,7 @@ TabParent::Destroy()
bool
TabParent::Recv__delete__()
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
Manager()->AsContentParent()->NotifyTabDestroyed(this, mMarkedDestroying);
ContentParent::DeallocateTabId(mTabId,
Manager()->AsContentParent()->ChildID());

2
dom/media/MediaManager.cpp
View File

@ -1449,7 +1449,7 @@ MediaManager::NotifyRecordingStatusChange(nsPIDOMWindow* aWindow,
// Forward recording events to parent process.
// The events are gathered in chrome process and used for recording indicator
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
unused <<
dom::ContentChild::GetSingleton()->SendRecordingDeviceEvents(aMsg,
requestURL,

2
dom/media/gmp/GMPService.cpp
View File

@ -109,7 +109,7 @@ private:
MOZ_ASSERT(NS_IsMainThread());
if (!sSingletonService) {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsRefPtr<GeckoMediaPluginServiceParent> service =
new GeckoMediaPluginServiceParent();
service->Init();

2
dom/media/gmp/GMPServiceChild.cpp
View File

@ -33,7 +33,7 @@ namespace gmp {
already_AddRefed<GeckoMediaPluginServiceChild>
GeckoMediaPluginServiceChild::GetSingleton()
{
MOZ_ASSERT(!XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default);
nsRefPtr<GeckoMediaPluginService> service(
GeckoMediaPluginService::GetGeckoMediaPluginService());
#ifdef DEBUG

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

@ -60,7 +60,7 @@ static const uint32_t NodeIdSaltLength = 32;
already_AddRefed<GeckoMediaPluginServiceParent>
GeckoMediaPluginServiceParent::GetSingleton()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
nsRefPtr<GeckoMediaPluginService> service(
GeckoMediaPluginServiceParent::GetGeckoMediaPluginService());
#ifdef DEBUG
@ -144,7 +144,7 @@ GeckoMediaPluginServiceParent::InitStorage()
MOZ_ASSERT(NS_IsMainThread());
// GMP storage should be used in the chrome process only.
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return NS_OK;
}

12
dom/media/webspeech/synth/nsSpeechTask.cpp
View File

@ -146,7 +146,7 @@ NS_IMETHODIMP
nsSpeechTask::Setup(nsISpeechTaskCallback* aCallback,
uint32_t aChannels, uint32_t aRate, uint8_t argc)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
LOG(LogLevel::Debug, ("nsSpeechTask::Setup"));
@ -195,7 +195,7 @@ NS_IMETHODIMP
nsSpeechTask::SendAudio(JS::Handle<JS::Value> aData, JS::Handle<JS::Value> aLandmarks,
JSContext* aCx)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
NS_ENSURE_TRUE(mStream, NS_ERROR_NOT_AVAILABLE);
NS_ENSURE_FALSE(mStream->IsDestroyed(), NS_ERROR_NOT_AVAILABLE);
@ -237,7 +237,7 @@ nsSpeechTask::SendAudio(JS::Handle<JS::Value> aData, JS::Handle<JS::Value> aLand
NS_IMETHODIMP
nsSpeechTask::SendAudioNative(int16_t* aData, uint32_t aDataLen)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
NS_ENSURE_TRUE(mStream, NS_ERROR_NOT_AVAILABLE);
NS_ENSURE_FALSE(mStream->IsDestroyed(), NS_ERROR_NOT_AVAILABLE);
@ -481,7 +481,7 @@ nsSpeechTask::DispatchMarkImpl(const nsAString& aName,
void
nsSpeechTask::Pause()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
if (mCallback) {
DebugOnly<nsresult> rv = mCallback->OnPause();
@ -497,7 +497,7 @@ nsSpeechTask::Pause()
void
nsSpeechTask::Resume()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
if (mCallback) {
DebugOnly<nsresult> rv = mCallback->OnResume();
@ -513,7 +513,7 @@ nsSpeechTask::Resume()
void
nsSpeechTask::Cancel()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
LOG(LogLevel::Debug, ("nsSpeechTask::Cancel"));

12
dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
View File

@ -100,7 +100,7 @@ NS_IMPL_ISUPPORTS(nsSynthVoiceRegistry, nsISynthVoiceRegistry)
nsSynthVoiceRegistry::nsSynthVoiceRegistry()
: mSpeechSynthChild(nullptr)
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mSpeechSynthChild = new SpeechSynthesisChild();
ContentChild::GetSingleton()->SendPSpeechSynthesisConstructor(mSpeechSynthChild);
@ -165,7 +165,7 @@ void
nsSynthVoiceRegistry::Shutdown()
{
LOG(LogLevel::Debug, ("[%s] nsSynthVoiceRegistry::Shutdown()",
(XRE_IsContentProcess()) ? "Content" : "Default"));
(XRE_GetProcessType() == GeckoProcessType_Content) ? "Content" : "Default"));
gSynthVoiceRegistry = nullptr;
}
@ -236,7 +236,7 @@ nsSynthVoiceRegistry::AddVoice(nsISpeechService* aService,
NS_ConvertUTF16toUTF8(aLang).get(),
aLocalService ? "true" : "false"));
NS_ENSURE_FALSE(XRE_IsContentProcess(),
NS_ENSURE_FALSE(XRE_GetProcessType() == GeckoProcessType_Content,
NS_ERROR_NOT_AVAILABLE);
return AddVoiceImpl(aService, aUri, aName, aLang,
@ -250,7 +250,7 @@ nsSynthVoiceRegistry::RemoveVoice(nsISpeechService* aService,
LOG(LogLevel::Debug,
("nsSynthVoiceRegistry::RemoveVoice uri='%s' (%s)",
NS_ConvertUTF16toUTF8(aUri).get(),
(XRE_IsContentProcess()) ? "child" : "parent"));
(XRE_GetProcessType() == GeckoProcessType_Content) ? "child" : "parent"));
bool found = false;
VoiceData* retval = mUriVoiceMap.GetWeak(aUri, &found);
@ -289,7 +289,7 @@ nsSynthVoiceRegistry::SetDefaultVoice(const nsAString& aUri,
mDefaultVoices.AppendElement(retval);
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsTArray<SpeechSynthesisParent*> ssplist;
GetAllSpeechSynthActors(ssplist);
@ -521,7 +521,7 @@ nsSynthVoiceRegistry::SpeakUtterance(SpeechSynthesisUtterance& aUtterance,
}
nsRefPtr<nsSpeechTask> task;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
task = new SpeechTaskChild(&aUtterance);
SpeechSynthesisRequestChild* actor =
new SpeechSynthesisRequestChild(static_cast<SpeechTaskChild*>(task.get()));

2
dom/media/webspeech/synth/pico/nsPicoService.cpp
View File

@ -723,7 +723,7 @@ nsPicoService*
nsPicoService::GetInstance()
{
MOZ_ASSERT(NS_IsMainThread());
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
MOZ_ASSERT(false, "nsPicoService can only be started on main gecko process");
return nullptr;
}

2
dom/media/webspeech/synth/test/nsFakeSynthServices.cpp
View File

@ -326,7 +326,7 @@ nsFakeSynthServices*
nsFakeSynthServices::GetInstance()
{
MOZ_ASSERT(NS_IsMainThread());
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
MOZ_ASSERT(false, "nsFakeSynthServices can only be started on main gecko process");
return nullptr;
}

2
dom/mobileconnection/MobileConnectionArray.cpp
View File

@ -101,7 +101,7 @@ NS_CreateMobileConnectionService()
{
nsCOMPtr<nsIMobileConnectionService> service;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
service = new mozilla::dom::mobileconnection::MobileConnectionIPCService();
} else {
#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)

6
dom/mobilemessage/MobileMessageManager.cpp
View File

@ -845,7 +845,7 @@ NS_CreateSmsService()
{
nsCOMPtr<nsISmsService> smsService;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
smsService = SmsIPCService::GetSingleton();
} else {
#ifdef MOZ_WIDGET_ANDROID
@ -862,7 +862,7 @@ already_AddRefed<nsIMobileMessageDatabaseService>
NS_CreateMobileMessageDatabaseService()
{
nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mobileMessageDBService = SmsIPCService::GetSingleton();
} else {
#ifdef MOZ_WIDGET_ANDROID
@ -881,7 +881,7 @@ NS_CreateMmsService()
{
nsCOMPtr<nsIMmsService> mmsService;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mmsService = SmsIPCService::GetSingleton();
} else {
#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)

2
dom/network/UDPSocket.cpp
View File

@ -558,7 +558,7 @@ UDPSocket::Init(const nsString& aLocalAddress,
}
nsresult rv;
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
rv = mSocket->InitRemote(mSocket->mLocalAddress, localPort);
} else {
rv = mSocket->InitLocal(mSocket->mLocalAddress, localPort);

2
dom/nfc/gonk/NfcService.cpp
View File

@ -312,7 +312,7 @@ NfcService::~NfcService()
already_AddRefed<NfcService>
NfcService::FactoryCreate()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return nullptr;
}

4
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@ -249,7 +249,7 @@ nsNPAPIPlugin::PluginCrashed(const nsAString& pluginDumpID,
bool
nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return true;
}
@ -404,7 +404,7 @@ GetNewPluginLibrary(nsPluginTag *aPluginTag)
return nullptr;
}
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return PluginModuleContentParent::LoadModule(aPluginTag->mId);
}

36
dom/plugins/base/nsPluginHost.cpp
View File

@ -253,7 +253,7 @@ nsPluginHost::nsPluginHost()
// good plugin list the first time it requests it. Normally we'd just
// init this to 1, but due to the unique nature of our ctor we need to do
// this manually.
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
IncrementChromeEpoch();
}
@ -1271,7 +1271,7 @@ nsresult nsPluginHost::EnsurePluginLoaded(nsPluginTag* aPluginTag)
nsresult
nsPluginHost::GetPluginForContentProcess(uint32_t aPluginId, nsNPAPIPlugin** aPlugin)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
// If plugins haven't been scanned yet, do so now
LoadPlugins();
@ -1336,7 +1336,7 @@ protected:
void
nsPluginHost::NotifyContentModuleDestroyed(uint32_t aPluginId)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
// This is called in response to a message from the plugin. Don't unload the
// plugin until the message handler is off the stack.
@ -1842,7 +1842,7 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
bool aCreatePluginList,
bool *aPluginsChanged)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
NS_ENSURE_ARG_POINTER(aPluginsChanged);
nsresult rv;
@ -2049,7 +2049,7 @@ nsresult nsPluginHost::ScanPluginsDirectoryList(nsISimpleEnumerator *dirEnum,
bool aCreatePluginList,
bool *aPluginsChanged)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
bool hasMore;
while (NS_SUCCEEDED(dirEnum->HasMoreElements(&hasMore)) && hasMore) {
@ -2078,28 +2078,28 @@ nsresult nsPluginHost::ScanPluginsDirectoryList(nsISimpleEnumerator *dirEnum,
void
nsPluginHost::IncrementChromeEpoch()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
mPluginEpoch++;
}
uint32_t
nsPluginHost::ChromeEpoch()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
return mPluginEpoch;
}
uint32_t
nsPluginHost::ChromeEpochForContent()
{
MOZ_ASSERT(XRE_IsContentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content);
return mPluginEpoch;
}
void
nsPluginHost::SetChromeEpochForContent(uint32_t aEpoch)
{
MOZ_ASSERT(XRE_IsContentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content);
mPluginEpoch = aEpoch;
}
@ -2129,7 +2129,7 @@ WatchRegKey(uint32_t aRoot, nsCOMPtr<nsIWindowsRegKey>& aKey)
nsresult nsPluginHost::LoadPlugins()
{
#ifdef ANDROID
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return NS_OK;
}
#endif
@ -2153,7 +2153,7 @@ nsresult nsPluginHost::LoadPlugins()
// only if plugins have changed will we notify plugin-change observers
if (pluginschanged) {
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
IncrementChromeEpoch();
}
@ -2169,7 +2169,7 @@ nsresult nsPluginHost::LoadPlugins()
nsresult
nsPluginHost::FindPluginsInContent(bool aCreatePluginList, bool* aPluginsChanged)
{
MOZ_ASSERT(XRE_IsContentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content);
dom::ContentChild* cp = dom::ContentChild::GetSingleton();
nsTArray<PluginTag> plugins;
@ -2225,7 +2225,7 @@ nsresult nsPluginHost::FindPlugins(bool aCreatePluginList, bool * aPluginsChange
*aPluginsChanged = false;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return FindPluginsInContent(aCreatePluginList, aPluginsChanged);
}
@ -2392,7 +2392,7 @@ mozilla::plugins::FindPluginsForContent(uint32_t aPluginEpoch,
nsTArray<PluginTag>* aPlugins,
uint32_t* aNewPluginEpoch)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
host->FindPluginsForContent(aPluginEpoch, aPlugins, aNewPluginEpoch);
@ -2404,7 +2404,7 @@ nsPluginHost::FindPluginsForContent(uint32_t aPluginEpoch,
nsTArray<PluginTag>* aPlugins,
uint32_t* aNewPluginEpoch)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
// Load plugins so that the epoch is correct.
LoadPlugins();
@ -2444,7 +2444,7 @@ nsPluginHost::FindPluginsForContent(uint32_t aPluginEpoch,
void
nsPluginHost::UpdatePluginInfo(nsPluginTag* aPluginTag)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
ReadPluginInfo();
WritePluginInfo();
@ -2530,7 +2530,7 @@ nsPluginHost::RegisterWithCategoryManager(nsCString &aMimeType,
nsresult
nsPluginHost::WritePluginInfo()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
nsresult rv = NS_OK;
nsCOMPtr<nsIProperties> directoryService(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID,&rv));
@ -2675,7 +2675,7 @@ nsPluginHost::WritePluginInfo()
nsresult
nsPluginHost::ReadPluginInfo()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
const long PLUGIN_REG_MIMETYPES_ARRAY_SIZE = 12;
const long PLUGIN_REG_MAX_MIMETYPES = 1000;

8
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@ -652,7 +652,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetNetscapeWindow(void *value)
// we only attempt to get the nearest window if this really is a "windowless" plugin so as not
// to change any behaviour for the much more common windowed plugins,
// though why this method would even be being called for a windowed plugin escapes me.
if (!XRE_IsContentProcess() &&
if (XRE_GetProcessType() != GeckoProcessType_Content &&
mPluginWindow && mPluginWindow->type == NPWindowTypeDrawable) {
// it turns out that flash also uses this window for determining focus, and is currently
// unable to show a caret correctly if we return the enclosing window. Therefore for
@ -2840,7 +2840,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void)
parentWidget = nsContentUtils::WidgetForDocument(doc);
#ifndef XP_MACOSX
// If we're running in the content process, we need a remote widget created in chrome.
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
nsCOMPtr<nsIDOMWindow> window = doc->GetWindow();
if (window) {
nsCOMPtr<nsIDOMWindow> topWindow;
@ -2962,7 +2962,7 @@ void nsPluginInstanceOwner::FixUpPluginWindow(int32_t inPaintState)
mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top;
mPluginWindow->clipRect.right = mPluginWindow->clipRect.left;
}
else if (!XRE_IsParentProcess())
else if (XRE_GetProcessType() != GeckoProcessType_Default)
{
// For e10s we only support async windowless plugin. This means that
// we're always going to allocate a full window for the plugin to draw
@ -3156,7 +3156,7 @@ nsPluginInstanceOwner::UpdateDocumentActiveState(bool aIsActive)
// to be forwarded over after the active state is updated. If we
// don't hide plugin widgets in hidden tabs, the native child window
// in chrome will remain visible after a tab switch.
if (mWidget && XRE_IsContentProcess()) {
if (mWidget && XRE_GetProcessType() == GeckoProcessType_Content) {
mWidget->Show(aIsActive);
mWidget->Enable(aIsActive);
}

2
dom/plugins/base/nsPluginNativeWindowGtk.cpp
View File

@ -72,7 +72,7 @@ nsresult nsPluginNativeWindowGtk::CallSetWindow(nsRefPtr<nsNPAPIPluginInstance>
{
if (aPluginInstance) {
if (type == NPWindowTypeWindow &&
XRE_IsContentProcess()) {
XRE_GetProcessType() == GeckoProcessType_Content) {
// In this case, most of the initialization code here has already happened
// in the chrome process. The window we have in content is the XID of the
// socket widget we need to hand to plugins.

2
dom/plugins/base/nsPluginNativeWindowWin.cpp
View File

@ -617,7 +617,7 @@ nsresult nsPluginNativeWindowWin::CallSetWindow(nsRefPtr<nsNPAPIPluginInstance>
// With e10s we execute in the content process and as such we don't
// have access to native widgets. CallSetWindow and skip native widget
// subclassing.
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
nsPluginNativeWindow::CallSetWindow(aPluginInstance);
return NS_OK;
}

2
dom/plugins/base/nsPluginTags.cpp
View File

@ -651,7 +651,7 @@ nsPluginTag::GetBlocklistState(uint32_t *aResult)
return NS_OK;
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
*aResult = nsIBlocklistService::STATE_BLOCKED;
dom::ContentChild* cp = dom::ContentChild::GetSingleton();
if (!cp->SendGetBlocklistState(mId, aResult)) {

4
dom/plugins/ipc/PluginInstanceParent.cpp
View File

@ -1856,7 +1856,7 @@ PluginInstanceParent::SubclassPluginWindow(HWND aWnd)
return;
}
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
if (!aWnd) {
NS_WARNING("PluginInstanceParent::SubclassPluginWindow unexpected null window");
return;
@ -1886,7 +1886,7 @@ PluginInstanceParent::SubclassPluginWindow(HWND aWnd)
void
PluginInstanceParent::UnsubclassPluginWindow()
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
if (mPluginHWND) {
// Remove 'this' from the plugin list safely
nsAutoPtr<PluginInstanceParent> tmp;

4
dom/plugins/ipc/PluginModuleParent.cpp
View File

@ -352,7 +352,7 @@ bool PluginModuleMapping::sIsLoadModuleOnStack = false;
void
mozilla::plugins::TerminatePlugin(uint32_t aPluginId, const nsString& aBrowserDumpId)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
nsPluginTag* pluginTag = host->PluginWithId(aPluginId);
@ -370,7 +370,7 @@ PluginModuleContentParent::LoadModule(uint32_t aPluginId)
PluginModuleMapping::NotifyLoadingModule loadingModule;
nsAutoPtr<PluginModuleMapping> mapping(new PluginModuleMapping(aPluginId));
MOZ_ASSERT(XRE_IsContentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content);
/*
* We send a LoadPlugin message to the chrome process using an intr

2
dom/promise/PromiseDebugging.cpp
View File

@ -96,7 +96,7 @@ PromiseDebugging::Init()
// Generate a prefix for identifiers: "PromiseDebugging.$processid."
sIDPrefix = NS_LITERAL_STRING("PromiseDebugging.");
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
sIDPrefix.AppendInt(ContentChild::GetSingleton()->GetID());
sIDPrefix.Append('.');
} else {

17
dom/quota/QuotaManager.cpp
View File

@ -756,6 +756,11 @@ struct MOZ_STACK_CLASS InactiveOriginsInfo
nsTArray<OriginInfo*>& origins;
};
bool
IsMainProcess()
{
return XRE_GetProcessType() == GeckoProcessType_Default;
}
void
SanitizeOriginString(nsCString& aOrigin)
@ -1365,7 +1370,7 @@ nsresult
QuotaManager::Init()
{
nsresult rv;
if (XRE_IsParentProcess()) {
if (IsMainProcess()) {
nsCOMPtr<nsIFile> baseDir;
rv = NS_GetSpecialDirectory(NS_APP_INDEXEDDB_PARENT_DIR,
getter_AddRefs(baseDir));
@ -2786,7 +2791,7 @@ QuotaManager::GetUsageForURI(nsIURI* aURI,
NS_ENSURE_ARG_POINTER(aCallback);
// This only works from the main process.
NS_ENSURE_TRUE(XRE_IsParentProcess(), NS_ERROR_NOT_AVAILABLE);
NS_ENSURE_TRUE(IsMainProcess(), NS_ERROR_NOT_AVAILABLE);
if (!aOptionalArgCount) {
aAppId = nsIScriptSecurityManager::NO_APP_ID;
@ -2874,7 +2879,7 @@ QuotaManager::ClearStoragesForURI(nsIURI* aURI,
}
// This only works from the main process.
NS_ENSURE_TRUE(XRE_IsParentProcess(), NS_ERROR_NOT_AVAILABLE);
NS_ENSURE_TRUE(IsMainProcess(), NS_ERROR_NOT_AVAILABLE);
if (!aOptionalArgCount) {
aAppId = nsIScriptSecurityManager::NO_APP_ID;
@ -2977,7 +2982,7 @@ QuotaManager::Observe(nsISupports* aSubject,
NS_ERROR("Shutdown more than once?!");
}
if (XRE_IsParentProcess()) {
if (IsMainProcess()) {
// Kick off the shutdown timer.
if (NS_FAILED(mShutdownTimer->Init(this, DEFAULT_SHUTDOWN_TIMER_MS,
nsITimer::TYPE_ONE_SHOT))) {
@ -3016,7 +3021,7 @@ QuotaManager::Observe(nsISupports* aSubject,
}
if (!strcmp(aTopic, NS_TIMER_CALLBACK_TOPIC)) {
NS_ASSERTION(XRE_IsParentProcess(), "Should only happen in the main process!");
NS_ASSERTION(IsMainProcess(), "Should only happen in the main process!");
NS_WARNING("Some storage operations are taking longer than expected "
"during shutdown and will be aborted!");
@ -3210,7 +3215,7 @@ QuotaManager::ClearStoragesForApp(uint32_t aAppId, bool aBrowserOnly)
NS_ASSERTION(aAppId != kUnknownAppId, "Bad appId!");
// This only works from the main process.
NS_ENSURE_TRUE(XRE_IsParentProcess(), NS_ERROR_NOT_AVAILABLE);
NS_ENSURE_TRUE(IsMainProcess(), NS_ERROR_NOT_AVAILABLE);
nsAutoCString pattern;
GetOriginPatternStringMaybeIgnoreBrowser(aAppId, aBrowserOnly, pattern);

8
dom/speakermanager/SpeakerManagerService.cpp
View File

@ -30,7 +30,7 @@ SpeakerManagerService::GetOrCreateSpeakerManagerService()
{
MOZ_ASSERT(NS_IsMainThread());
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return SpeakerManagerServiceChild::GetOrCreateSpeakerManagerService();
}
@ -52,7 +52,7 @@ SpeakerManagerService::GetSpeakerManagerService()
{
MOZ_ASSERT(NS_IsMainThread());
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return SpeakerManagerServiceChild::GetSpeakerManagerService();
}
@ -62,7 +62,7 @@ SpeakerManagerService::GetSpeakerManagerService()
void
SpeakerManagerService::Shutdown()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return SpeakerManagerServiceChild::Shutdown();
}
@ -188,7 +188,7 @@ SpeakerManagerService::SpeakerManagerService()
mVisible(false)
{
MOZ_COUNT_CTOR(SpeakerManagerService);
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
if (obs) {
obs->AddObserver(this, "ipc:content-shutdown", false);

4
dom/storage/DOMStorageCache.cpp
View File

@ -761,7 +761,7 @@ DOMStorageCache::StartDatabase()
return sDatabase;
}
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsAutoPtr<DOMStorageDBThread> db(new DOMStorageDBThread());
nsresult rv = db->Init();
@ -806,7 +806,7 @@ DOMStorageCache::StopDatabase()
sDatabaseDown = true;
nsresult rv = sDatabase->Shutdown();
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
delete sDatabase;
} else {
DOMStorageDBChild* child = static_cast<DOMStorageDBChild*>(sDatabase);

6
dom/storage/DOMStorageManager.cpp
View File

@ -592,7 +592,7 @@ DOMStorageManager::Observe(const char* aTopic, const nsACString& aScopePrefix)
}
if (!strcmp(aTopic, "test-flushed")) {
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
if (obs) {
obs->NotifyObservers(nullptr, "domstorage-test-flushed", nullptr);
@ -615,7 +615,7 @@ DOMLocalStorageManager::DOMLocalStorageManager()
NS_ASSERTION(!sSelf, "Somebody is trying to do_CreateInstance(\"@mozilla/dom/localStorage-manager;1\"");
sSelf = this;
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
// Do this only on the child process. The thread IPC bridge
// is also used to communicate chrome observer notifications.
// Note: must be called after we set sSelf
@ -648,7 +648,7 @@ DOMLocalStorageManager::Ensure()
DOMSessionStorageManager::DOMSessionStorageManager()
: DOMStorageManager(SessionStorage)
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
// Do this only on the child process. The thread IPC bridge
// is also used to communicate chrome observer notifications.
DOMStorageCache::StartDatabase();

2
dom/storage/DOMStorageObserver.cpp
View File

@ -75,7 +75,7 @@ DOMStorageObserver::Init()
#ifdef DOM_STORAGE_TESTS
// Testing
obs->AddObserver(sSelf, "domstorage-test-flush-force", true);
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// Only to forward to child process.
obs->AddObserver(sSelf, "domstorage-test-flushed", true);
}

2
dom/system/gonk/AudioManager.cpp
View File

@ -555,7 +555,7 @@ already_AddRefed<AudioManager>
AudioManager::GetInstance()
{
// Avoid createing AudioManager from content process.
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
MOZ_CRASH("Non-chrome processes should not get here.");
}

10
dom/system/gonk/AutoMounter.cpp
View File

@ -1298,7 +1298,7 @@ ShutdownAutoMounterIOThread()
static void
SetAutoMounterModeIOThread(const int32_t& aMode)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
MOZ_ASSERT(sAutoMounter);
@ -1308,7 +1308,7 @@ SetAutoMounterModeIOThread(const int32_t& aMode)
static void
SetAutoMounterSharingModeIOThread(const nsCString& aVolumeName, const bool& aAllowSharing)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
MOZ_ASSERT(sAutoMounter);
@ -1318,7 +1318,7 @@ SetAutoMounterSharingModeIOThread(const nsCString& aVolumeName, const bool& aAll
static void
AutoMounterFormatVolumeIOThread(const nsCString& aVolumeName)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
MOZ_ASSERT(sAutoMounter);
@ -1328,7 +1328,7 @@ AutoMounterFormatVolumeIOThread(const nsCString& aVolumeName)
static void
AutoMounterMountVolumeIOThread(const nsCString& aVolumeName)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
MOZ_ASSERT(sAutoMounter);
@ -1338,7 +1338,7 @@ AutoMounterMountVolumeIOThread(const nsCString& aVolumeName)
static void
AutoMounterUnmountVolumeIOThread(const nsCString& aVolumeName)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
MOZ_ASSERT(sAutoMounter);

2
dom/system/gonk/NetworkWorker.cpp
View File

@ -134,7 +134,7 @@ NetworkWorker::~NetworkWorker()
already_AddRefed<NetworkWorker>
NetworkWorker::FactoryCreate()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return nullptr;
}

2
dom/system/gonk/SystemWorkerManager.cpp
View File

@ -72,7 +72,7 @@ SystemWorkerManager::~SystemWorkerManager()
nsresult
SystemWorkerManager::Init()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return NS_ERROR_NOT_AVAILABLE;
}

26
dom/system/gonk/Volume.cpp
View File

@ -233,7 +233,7 @@ Volume::SetConfig(const nsCString& aConfigName, const nsCString& aConfigValue)
void
Volume::SetMediaPresent(bool aMediaPresent)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
// mMediaPresent is slightly redunant to the state, however
@ -308,7 +308,7 @@ Volume::SetUnmountRequested(bool aUnmountRequested)
void
Volume::SetState(Volume::STATE aNewState)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
if (aNewState == mState) {
return;
@ -380,7 +380,7 @@ Volume::SetState(Volume::STATE aNewState)
void
Volume::SetMountPoint(const nsCSubstring& aMountPoint)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
if (mMountPoint.Equals(aMountPoint)) {
@ -393,7 +393,7 @@ Volume::SetMountPoint(const nsCSubstring& aMountPoint)
void
Volume::StartMount(VolumeResponseCallback* aCallback)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
StartCommand(new VolumeActionCommand(this, "mount", "", aCallback));
@ -402,7 +402,7 @@ Volume::StartMount(VolumeResponseCallback* aCallback)
void
Volume::StartUnmount(VolumeResponseCallback* aCallback)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
StartCommand(new VolumeActionCommand(this, "unmount", "force", aCallback));
@ -411,7 +411,7 @@ Volume::StartUnmount(VolumeResponseCallback* aCallback)
void
Volume::StartFormat(VolumeResponseCallback* aCallback)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
StartCommand(new VolumeActionCommand(this, "format", "", aCallback));
@ -420,7 +420,7 @@ Volume::StartFormat(VolumeResponseCallback* aCallback)
void
Volume::StartShare(VolumeResponseCallback* aCallback)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
StartCommand(new VolumeActionCommand(this, "share", "ums", aCallback));
@ -429,7 +429,7 @@ Volume::StartShare(VolumeResponseCallback* aCallback)
void
Volume::StartUnshare(VolumeResponseCallback* aCallback)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
StartCommand(new VolumeActionCommand(this, "unshare", "ums", aCallback));
@ -438,7 +438,7 @@ Volume::StartUnshare(VolumeResponseCallback* aCallback)
void
Volume::StartCommand(VolumeCommand* aCommand)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
VolumeManager::PostCommand(aCommand);
@ -448,7 +448,7 @@ Volume::StartCommand(VolumeCommand* aCommand)
void
Volume::RegisterVolumeObserver(Volume::EventObserver* aObserver, const char* aName)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
sEventObserverList.AddObserver(aObserver);
@ -468,7 +468,7 @@ Volume::RegisterVolumeObserver(Volume::EventObserver* aObserver, const char* aNa
void
Volume::UnregisterVolumeObserver(Volume::EventObserver* aObserver, const char* aName)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
sEventObserverList.RemoveObserver(aObserver);
@ -483,7 +483,7 @@ Volume::UpdateMountLock(const nsACString& aVolumeName,
const int32_t& aMountGeneration,
const bool& aMountLocked)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
RefPtr<Volume> vol = VolumeManager::FindVolumeByName(aVolumeName);
@ -500,7 +500,7 @@ Volume::UpdateMountLock(const nsACString& aVolumeName,
void
Volume::HandleVoldResponse(int aResponseCode, nsCWhitespaceTokenizer& aTokenizer)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
// The volume name will have already been parsed, and the tokenizer will point

20
dom/system/gonk/nsVolume.cpp
View File

@ -246,7 +246,7 @@ NS_IMETHODIMP nsVolume::GetIsHotSwappable(bool *aIsHotSwappable)
NS_IMETHODIMP nsVolume::Format()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
XRE_GetIOMessageLoop()->PostTask(
FROM_HERE,
@ -258,7 +258,7 @@ NS_IMETHODIMP nsVolume::Format()
/* static */
void nsVolume::FormatVolumeIOThread(const nsCString& aVolume)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
if (VolumeManager::State() != VolumeManager::VOLUMES_READY) {
@ -270,7 +270,7 @@ void nsVolume::FormatVolumeIOThread(const nsCString& aVolume)
NS_IMETHODIMP nsVolume::Mount()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
XRE_GetIOMessageLoop()->PostTask(
FROM_HERE,
@ -282,7 +282,7 @@ NS_IMETHODIMP nsVolume::Mount()
/* static */
void nsVolume::MountVolumeIOThread(const nsCString& aVolume)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
if (VolumeManager::State() != VolumeManager::VOLUMES_READY) {
@ -294,7 +294,7 @@ void nsVolume::MountVolumeIOThread(const nsCString& aVolume)
NS_IMETHODIMP nsVolume::Unmount()
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
XRE_GetIOMessageLoop()->PostTask(
FROM_HERE,
@ -306,7 +306,7 @@ NS_IMETHODIMP nsVolume::Unmount()
/* static */
void nsVolume::UnmountVolumeIOThread(const nsCString& aVolume)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
if (VolumeManager::State() != VolumeManager::VOLUMES_READY) {
@ -364,7 +364,7 @@ void nsVolume::Set(nsIVolume* aVolume)
mMountGeneration = volMountGeneration;
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
// Child processes just track the state, not maintain it.
aVolume->GetIsMountLocked(&mMountLocked);
return;
@ -386,7 +386,7 @@ void nsVolume::Set(nsIVolume* aVolume)
void
nsVolume::UpdateMountLock(const nsAString& aMountLockState)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
// There are 3 states, unlocked, locked-background, and locked-foreground
@ -397,7 +397,7 @@ nsVolume::UpdateMountLock(const nsAString& aMountLockState)
void
nsVolume::UpdateMountLock(bool aMountLocked)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
if (aMountLocked == mMountLocked) {
@ -447,7 +447,7 @@ nsVolume::SetState(int32_t aState)
{
static int32_t sMountGeneration = 0;
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(IsFake());

18
dom/system/gonk/nsVolumeService.cpp
View File

@ -68,7 +68,7 @@ nsVolumeService::Shutdown()
if (!sSingleton) {
return;
}
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
sSingleton = nullptr;
return;
}
@ -92,7 +92,7 @@ nsVolumeService::nsVolumeService()
{
sSingleton = this;
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
// VolumeServiceIOThread and the WakeLock listener should only run in the
// parent, so we return early.
return;
@ -271,7 +271,7 @@ nsVolumeService::GetVolumeNames(nsIArray** aVolNames)
void
nsVolumeService::GetVolumesForIPC(nsTArray<VolumeInfo>* aResult)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
MonitorAutoLock autoLock(mArrayMonitor);
@ -299,7 +299,7 @@ nsVolumeService::GetVolumesForIPC(nsTArray<VolumeInfo>* aResult)
void
nsVolumeService::RecvVolumesFromParent(const nsTArray<VolumeInfo>& aVolumes)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
// We are the parent. Therefore our volumes are already correct.
return;
}
@ -340,7 +340,7 @@ void
nsVolumeService::CheckMountLock(const nsAString& aMountLockName,
const nsAString& aMountLockState)
{
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<nsVolume> vol = FindVolumeByMountLockName(aMountLockName);
@ -438,7 +438,7 @@ nsVolumeService::UpdateVolume(nsIVolume* aVolume, bool aNotifyObservers)
NS_IMETHODIMP
nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsRefPtr<nsVolume> vol = new nsVolume(name, path, nsIVolume::STATE_INIT,
-1 /* mountGeneration */,
true /* isMediaPresent */,
@ -461,7 +461,7 @@ nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path)
NS_IMETHODIMP
nsVolumeService::SetFakeVolumeState(const nsAString& name, int32_t state)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsRefPtr<nsVolume> vol;
{
MonitorAutoLock autoLock(mArrayMonitor);
@ -489,7 +489,7 @@ nsVolumeService::SetFakeVolumeState(const nsAString& name, int32_t state)
NS_IMETHODIMP
nsVolumeService::RemoveFakeVolume(const nsAString& name)
{
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
SetFakeVolumeState(name, nsIVolume::STATE_NOMEDIA);
RemoveVolumeByName(name);
return NS_OK;
@ -512,7 +512,7 @@ nsVolumeService::RemoveVolumeByName(const nsAString& aName)
}
mVolumeArray.RemoveElement(vol);
if (XRE_IsParentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsIObserverService> obs = GetObserverService();
if (!obs) {
return;

2
dom/telephony/Telephony.cpp
View File

@ -720,7 +720,7 @@ NS_CreateTelephonyService()
{
nsCOMPtr<nsITelephonyService> service;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
service = new mozilla::dom::telephony::TelephonyIPCService();
} else {
#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)

2
dom/voicemail/Voicemail.cpp
View File

@ -250,7 +250,7 @@ NS_CreateVoicemailService()
{
nsCOMPtr<nsIVoicemailService> service;
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
service = new mozilla::dom::voicemail::VoicemailIPCService();
} else {
#if defined(MOZ_B2G_RIL)

2
dom/wifi/WifiCertService.cpp
View File

@ -443,7 +443,7 @@ WifiCertService::~WifiCertService()
already_AddRefed<WifiCertService>
WifiCertService::FactoryCreate()
{
if (!XRE_IsParentProcess()) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
return nullptr;
}

Some files were not shown because too many files have changed in this diff Show More