summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 02:30:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 02:30:12 +0000
commitac282b5848d90db100955fee6ce47745f67e0f40 (patch)
treea7f1cb23c9be53cc524781feccc0ad1f5a59ab97 /ipc
parentReleasing progress-linux version 115.8.0esr-1~progress7.99u1. (diff)
downloadfirefox-esr-ac282b5848d90db100955fee6ce47745f67e0f40.tar.xz
firefox-esr-ac282b5848d90db100955fee6ce47745f67e0f40.zip
Merging upstream version 115.9.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/glue/GeckoChildProcessHost.cpp11
-rw-r--r--ipc/glue/GeckoChildProcessHost.h1
2 files changed, 1 insertions, 11 deletions
diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
index b4895e0e45..8d12ed2579 100644
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -263,8 +263,7 @@ class WindowsProcessLauncher : public BaseProcessLauncher {
WindowsProcessLauncher(GeckoChildProcessHost* aHost,
std::vector<std::string>&& aExtraOpts)
: BaseProcessLauncher(aHost, std::move(aExtraOpts)),
- mCachedNtdllThunk(GetCachedNtDllThunk()),
- mWerDataPointer(&(aHost->mWerData)) {}
+ mCachedNtdllThunk(GetCachedNtDllThunk()) {}
protected:
bool SetChannel(IPC::Channel*) override { return true; }
@@ -276,7 +275,6 @@ class WindowsProcessLauncher : public BaseProcessLauncher {
bool mUseSandbox = false;
const Buffer<IMAGE_THUNK_DATA>* mCachedNtdllThunk;
- CrashReporter::WindowsErrorReportingData const* mWerDataPointer;
};
typedef WindowsProcessLauncher ProcessLauncher;
#endif // XP_WIN
@@ -399,9 +397,6 @@ GeckoChildProcessHost::GeckoChildProcessHost(GeckoProcessType aProcessType,
mProcessState(CREATING_CHANNEL),
#ifdef XP_WIN
mGroupId(u"-"),
- mWerData{.mWerNotifyProc = CrashReporter::WerNotifyProc,
- .mChildPid = 0,
- .mMinidumpFile = {}},
#endif
#if defined(MOZ_SANDBOX) && defined(XP_WIN)
mEnableSandboxLogging(false),
@@ -1587,10 +1582,6 @@ Result<Ok, LaunchError> WindowsProcessLauncher::DoSetup() {
mLaunchOptions->handles_to_inherit.push_back(reinterpret_cast<HANDLE>(h));
std::string hStr = std::to_string(h);
mCmdLine->AppendLooseValue(UTF8ToWide(hStr));
-
- char werDataAddress[17] = {};
- SprintfLiteral(werDataAddress, "%p", mWerDataPointer);
- mCmdLine->AppendLooseValue(UTF8ToWide(werDataAddress));
}
// Process type
diff --git a/ipc/glue/GeckoChildProcessHost.h b/ipc/glue/GeckoChildProcessHost.h
index ccf8a4aca4..1ff01cd51a 100644
--- a/ipc/glue/GeckoChildProcessHost.h
+++ b/ipc/glue/GeckoChildProcessHost.h
@@ -258,7 +258,6 @@ class GeckoChildProcessHost : public ChildProcessHost,
#ifdef XP_WIN
void InitWindowsGroupID();
nsString mGroupId;
- CrashReporter::WindowsErrorReportingData mWerData;
# ifdef MOZ_SANDBOX
RefPtr<AbstractSandboxBroker> mSandboxBroker;
std::vector<std::wstring> mAllowedFilesRead;