nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out 2 changesets (bug 1886607) for causing build bustages on ChromeUtils.

Browse source 
Backed out changeset 2fa193524f2c (bug 1886607)
Backed out changeset f77ff6043d75 (bug 1886607)
This commit is contained in:
Cosmin Sabou 2024-03-22 00:28:44 +02:00
parent 079ff41016
commit 04a282cb4b
4 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
dom/base/ChromeUtils.cpp
View file

@ -1517,10 +1517,10 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
// DOM windows. // DOM windows.
/* aUtilityInfo = */ std::move(utilityActors), /* aUtilityInfo = */ std::move(utilityActors),
/* aChild = */ 0 // Without a ContentProcess, no ChildId. /* aChild = */ 0 // Without a ContentProcess, no ChildId.
#ifdef XP_DARWIN #ifdef XP_MACOSX
, ,
/* aChildTask = */ aGeckoProcess->GetChildTask() /* aChildTask = */ aGeckoProcess->GetChildTask()
#endif // XP_DARWIN #endif // XP_MACOSX
); );
}); });
@ -1619,10 +1619,10 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
/* aWindowInfo = */ std::move(windows), /* aWindowInfo = */ std::move(windows),
/* aUtilityInfo = */ nsTArray<UtilityInfo>(), /* aUtilityInfo = */ nsTArray<UtilityInfo>(),
/* aChild = */ contentParent->ChildID() /* aChild = */ contentParent->ChildID()
#ifdef XP_DARWIN #ifdef XP_MACOSX
, ,
/* aChildTask = */ contentParent->Process()->GetChildTask() /* aChildTask = */ contentParent->Process()->GetChildTask()
#endif // XP_DARWIN #endif // XP_MACOSX
); );
} }

2
ipc/glue/GeckoChildProcessHost.cpp
View file

@ -487,7 +487,7 @@ base::ProcessId GeckoChildProcessHost::GetChildProcessId() {
return base::GetProcId(mChildProcessHandle); return base::GetProcId(mChildProcessHandle);
} }
#ifdef XP_DARWIN #ifdef XP_MACOSX
task_t GeckoChildProcessHost::GetChildTask() { task_t GeckoChildProcessHost::GetChildTask() {
mozilla::AutoReadLock handleLock(mHandleLock); mozilla::AutoReadLock handleLock(mHandleLock);
return mChildTask; return mChildTask;

2
ipc/glue/GeckoChildProcessHost.h
View file

@ -151,7 +151,7 @@ class GeckoChildProcessHost : public SupportsWeakPtr,
GeckoProcessType GetProcessType() { return mProcessType; } GeckoProcessType GetProcessType() { return mProcessType; }
#ifdef XP_DARWIN #ifdef XP_MACOSX
task_t GetChildTask(); task_t GetChildTask();
#endif #endif

4
tools/profiler/core/platform.cpp
View file

@ -4840,10 +4840,10 @@ void SamplerThread::SpyOnUnregisteredThreads() {
/* aWindowInfo = */ nsTArray<WindowInfo>{}, /* aWindowInfo = */ nsTArray<WindowInfo>{},
/* aUtilityInfo = */ nsTArray<UtilityInfo>{}, /* aUtilityInfo = */ nsTArray<UtilityInfo>{},
/* aChild = */ 0 /* aChild = */ 0
#ifdef XP_DARWIN #ifdef XP_MACOSX
, ,
/* aChildTask = */ MACH_PORT_NULL /* aChildTask = */ MACH_PORT_NULL
#endif // XP_DARWIN #endif // XP_MACOSX
); );
const ProcInfoPromise::ResolveOrRejectValue procInfoOrError = const ProcInfoPromise::ResolveOrRejectValue procInfoOrError =