diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 02:29:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 02:29:22 +0000 |
| commit | 94c7990d8cb19e72b4ba8cd68f2d73969ffda3d9 (patch) | |
| tree | 05394de4b64996e5a27e92674fe5ec5edde116e6 /ipc | |
| parent | Adding debian version 115.8.0esr-1. (diff) | |
| download | firefox-esr-94c7990d8cb19e72b4ba8cd68f2d73969ffda3d9.tar.xz firefox-esr-94c7990d8cb19e72b4ba8cd68f2d73969ffda3d9.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.cpp | 11 | ||||
| -rw-r--r-- | ipc/glue/GeckoChildProcessHost.h | 1 |
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; |