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

Backed out 2 changesets (bug 1812035, bug 1806501) for causing bc failures in ipc/glue/test/browser/browser_utility_audioDecodeCrash.js CLOSED TREE

Browse source 
Backed out changeset d7f1a776a986 (bug 1806501)
Backed out changeset 4a44daa59af4 (bug 1812035)
This commit is contained in:
Sandor Molnar 2023-01-24 18:31:34 +02:00
parent 4c4d29b581
commit b6d0a71936
9 changed files with 12 additions and 51 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
browser/components/BrowserGlue.sys.mjs
View file

@ -2855,14 +2855,6 @@ BrowserGlue.prototype = {
},
},
{
// Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already.
name: "start-orb-javascript-oracle",
task: () => {
ChromeUtils.ensureJSOracleStarted();
},
},
{
name: "browser-startup-idle-tasks-finished",
task: () => {

13
dom/base/ChromeUtils.cpp
View file

@ -6,7 +6,6 @@
#include "ChromeUtils.h"
#include "JSOracleParent.h"
#include "js/CharacterEncoding.h"
#include "js/Object.h" // JS::GetClass
#include "js/PropertyAndElement.h" // JS_DefineProperty, JS_DefinePropertyById, JS_Enumerate, JS_GetProperty, JS_GetPropertyById, JS_SetProperty, JS_SetPropertyById, JS::IdVector
@ -1763,16 +1762,4 @@ bool ChromeUtils::IsDarkBackground(GlobalObject&, Element& aElement) {
double ChromeUtils::DateNow(GlobalObject&) { return JS_Now() / 1000.0; }
/* static */
void ChromeUtils::EnsureJSOracleStarted(GlobalObject&) {
JSOracleParent::WithJSOracle(
[](JSOracleParent* aParent) { MOZ_DIAGNOSTIC_ASSERT(aParent); });
}
/* static */
unsigned ChromeUtils::AliveUtilityProcesses(const GlobalObject&) {
const auto& utilityProcessManager =
mozilla::ipc::UtilityProcessManager::GetIfExists();
return utilityProcessManager ? utilityProcessManager->AliveProcesses() : 0;
}
} // namespace mozilla::dom

4
dom/base/ChromeUtils.h
View file

@ -284,10 +284,6 @@ class ChromeUtils {
static bool IsDarkBackground(GlobalObject&, Element&);
static double DateNow(GlobalObject&);
static void EnsureJSOracleStarted(GlobalObject&);
static unsigned AliveUtilityProcesses(const GlobalObject&);
};
} // namespace dom

11
dom/chrome-webidl/ChromeUtils.webidl
View file

@ -653,17 +653,6 @@ partial namespace ChromeUtils {
* Returns whether the background of the element is dark.
*/
boolean isDarkBackground(Element element);
/**
* Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already.
*/
undefined ensureJSOracleStarted();
/**
* The number of currently alive utility processes.
*/
[ChromeOnly]
readonly attribute unsigned long aliveUtilityProcesses;
};
/*

3
ipc/glue/UtilityProcessManager.h
View file

@ -130,8 +130,6 @@ class UtilityProcessManager final : public UtilityProcessHost::Listener {
// Shutdown all utility processes
void CleanShutdownAllProcesses();
uint16_t AliveProcesses();
private:
~UtilityProcessManager();
@ -198,6 +196,7 @@ class UtilityProcessManager final : public UtilityProcessHost::Listener {
RefPtr<ProcessFields> GetProcess(SandboxingKind);
bool NoMoreProcesses();
uint16_t AliveProcesses();
};
} // namespace ipc

2
toolkit/components/aboutmemory/tests/test_aboutmemory5.xhtml
View file

@ -132,7 +132,7 @@
socketProcessRunning = 1;
}
let m2 = (vsizes.length == (4 + socketProcessRunning + ChromeUtils.aliveUtilityProcesses) &&
let m2 = (vsizes.length == (4 + socketProcessRunning) &&
endOfBrowsers.length == 3);
ok(m2, "three content processes present in loaded data");
good = good && !!m2;

2
toolkit/components/aboutmemory/tests/test_memoryReporters.xhtml
View file

@ -230,7 +230,7 @@
if (SpecialPowers.Services.io.socketProcessLaunched) {
socketProcessRunning = 1;
}
is(aAmounts.length, (1 + socketProcessRunning + ChromeUtils.aliveUtilityProcesses),
ok(aAmounts.length == (1 + socketProcessRunning),
aName + " has " + aAmounts.length + " report");
let n = aAmounts[0];
if (!aCanBeUnreasonable) {

4
toolkit/components/aboutmemory/tests/test_memoryReporters2.xhtml
View file

@ -22,7 +22,7 @@
socketProcessRunning = 1;
}
let numToOpen = 3;
const expectedNumRemotes = numToOpen + socketProcessRunning + ChromeUtils.aliveUtilityProcesses;
const expectedNumRemotes = numToOpen + socketProcessRunning;
let numReady = 0;
// Create some remote processes, and set up message-passing so that
@ -89,7 +89,7 @@
} else {
ok(processes[i].startsWith("Browser (") || processes[i].startsWith("Web Content (") ||
(processes[i].startsWith("Socket (") && socketProcessRunning)
|| processes[i].startsWith("web (") || processes[i].startsWith("Utility ("),
|| processes[i].startsWith("web ("),
"correct non-empty process name prefix: " + processes[i]);
numNonEmptyProcesses++;
}

2
xpcom/base/nsMemoryReporterManager.cpp
View file

@ -1870,7 +1870,6 @@ nsresult nsMemoryReporterManager::StartGettingReports() {
}
}
if (!IsRegistrationBlocked()) {
if (RefPtr<UtilityProcessManager> utility =
UtilityProcessManager::GetIfExists()) {
for (RefPtr<UtilityProcessParent>& parent :
@ -1881,7 +1880,6 @@ nsresult nsMemoryReporterManager::StartGettingReports() {
}
}
}
}
if (!s->mChildrenPending.IsEmpty()) {
nsCOMPtr<nsITimer> timer;