Skip to content

Commit

Permalink
[sailfishos][embedlite] Avoid dropping freeze/thaw requests. Contribu…
Browse files Browse the repository at this point in the history
…tes to JB#51747

Getting the nsPIDOMWindowInner from its nsPIDOMWindowOuter previously
involved performing a QueryInterface. This is no longer the case
(GetCurrentInnerWindow() is used instead) which was causing the Freeze()
and Thaw() requests to exit early (when a null interface was returned).

This change fixes this.
  • Loading branch information
llewelld committed Nov 3, 2020
1 parent e1cf83b commit 3c06a99
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
Expand Up @@ -665,8 +665,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseChild::RecvSuspendTimeouts()
{
NS_ENSURE_TRUE(mDOMWindow, IPC_OK());

nsresult rv;
nsCOMPtr<nsPIDOMWindowInner> pwindow(do_QueryInterface(mDOMWindow, &rv));
nsCOMPtr<nsPIDOMWindowInner> pwindow(mDOMWindow->GetCurrentInnerWindow());
if (pwindow && !pwindow->IsFrozen()) {
pwindow->Freeze();
}
Expand All @@ -678,8 +677,8 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseChild::RecvResumeTimeouts()
{
NS_ENSURE_TRUE(mDOMWindow, IPC_OK());

nsresult rv;
nsCOMPtr<nsPIDOMWindowInner> pwindow(do_QueryInterface(mDOMWindow, &rv));
nsCOMPtr<nsPIDOMWindowInner> pwindow(mDOMWindow->GetCurrentInnerWindow());

if (pwindow && pwindow->IsFrozen()) {
pwindow->Thaw();
}
Expand Down

0 comments on commit 3c06a99

Please sign in to comment.