Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1826027 - Check whether window is destroyed during starting touch event. r=geckoview-reviewers,calu

Browse Source 
`HandleMotionEvent` have a race condition of destroying `nsWindow` (in Gecko
main thread) and dispatching touch event (Android UI thread). When destroying
the window, it can accept motion event.

So we should check whether window is destroyed.

Differential Revision: https://phabricator.services.mozilla.com/D174390
This commit is contained in:
Makoto Kato 2023-04-04 04:00:09 +00:00
parent 20cc0e0a3f
commit 785a9d72ef
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
widget/android/nsWindow.cpp
View File

@ -806,7 +806,14 @@ class NPZCSupport final
if (!win) {
return;
}
nsWindow* gkWindow = win->GetNsWindow();
RefPtr<nsWindow> gkWindow = win->GetNsWindow();
if (!gkWindow) {
return;
}
MutexAutoLock lock(gkWindow->GetDestroyMutex());
if (gkWindow->Destroyed()) {
return;
}
jni::NativeWeakPtr<NPZCSupport> weakPtrToThis =
gkWindow->GetNPZCSupportWeakPtr();
mObserver = Observer::Create(std::move(weakPtrToThis));
@ -1966,7 +1973,8 @@ nsWindow::nsWindow()
mDynamicToolbarMaxHeight(0),
mSizeMode(nsSizeMode_Normal),
mIsFullScreen(false),
mCompositorWidgetDelegate(nullptr) {}
mCompositorWidgetDelegate(nullptr),
mDestroyMutex("nsWindow::mDestroyMutex") {}
nsWindow::~nsWindow() {
gTopLevelWindows.RemoveElement(this);
@ -2035,6 +2043,8 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
}
void nsWindow::Destroy() {
MutexAutoLock lock(mDestroyMutex);
nsBaseWidget::mOnDestroyCalled = true;
// Disassociate our native object from GeckoView.

4
widget/android/nsWindow.h
View File

@ -129,6 +129,8 @@ class nsWindow final : public nsBaseWidget {
void DetachNatives();
mozilla::Mutex& GetDestroyMutex() { return mDestroyMutex; }
//
// nsIWidget
//
@ -282,6 +284,8 @@ class nsWindow final : public nsBaseWidget {
mozilla::widget::PlatformCompositorWidgetDelegate* mCompositorWidgetDelegate;
mozilla::Mutex mDestroyMutex;
friend class mozilla::widget::GeckoViewSupport;
friend class mozilla::widget::LayerViewSupport;
friend class mozilla::widget::NPZCSupport;