diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /widget/nsFilePickerProxy.cpp | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/nsFilePickerProxy.cpp')
-rw-r--r-- | widget/nsFilePickerProxy.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/widget/nsFilePickerProxy.cpp b/widget/nsFilePickerProxy.cpp index 8777f338cb..b71ad0920e 100644 --- a/widget/nsFilePickerProxy.cpp +++ b/widget/nsFilePickerProxy.cpp @@ -25,19 +25,19 @@ nsFilePickerProxy::nsFilePickerProxy() nsFilePickerProxy::~nsFilePickerProxy() = default; NS_IMETHODIMP -nsFilePickerProxy::Init(mozIDOMWindowProxy* aParent, const nsAString& aTitle, - nsIFilePicker::Mode aMode, - BrowsingContext* aBrowsingContext) { - BrowserChild* browserChild = BrowserChild::GetFrom(aParent); +nsFilePickerProxy::Init(BrowsingContext* aBrowsingContext, + const nsAString& aTitle, nsIFilePicker::Mode aMode) { + BrowserChild* browserChild = + BrowserChild::GetFrom(aBrowsingContext->GetDocShell()); if (!browserChild) { return NS_ERROR_FAILURE; } - mParent = nsPIDOMWindowOuter::From(aParent); - + mBrowsingContext = aBrowsingContext; mMode = aMode; - browserChild->SendPFilePickerConstructor(this, aTitle, aMode); + browserChild->SendPFilePickerConstructor(this, aTitle, aMode, + aBrowsingContext); mIPCActive = true; return NS_OK; @@ -155,8 +155,9 @@ nsFilePickerProxy::Close() { mozilla::ipc::IPCResult nsFilePickerProxy::Recv__delete__( const MaybeInputData& aData, const nsIFilePicker::ResultCode& aResult) { - nsPIDOMWindowInner* inner = - mParent ? mParent->GetCurrentInnerWindow() : nullptr; + auto* inner = mBrowsingContext->GetDOMWindow() + ? mBrowsingContext->GetDOMWindow()->GetCurrentInnerWindow() + : nullptr; if (NS_WARN_IF(!inner)) { return IPC_OK(); |