corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1961452 - Don't call SetAttached until native handle is set. r=geckoview-reviewers,ohall

Browse Source 
This issue is a possible crash case.

Actually `SessionAccessibility.NativeProvider.setAttached` is called in
C++ constructor of `SessionAccessibility`.  But native handle is set
after calling the constructor. So when `NativeProvider.setAttached` is
called, C++ side might not set native handle yet.

So we should not call `setAttached` in the constructor.

Differential Revision: https://phabricator.services.mozilla.com/D246070
This commit is contained in:
Makoto Kato
2025-04-23 06:49:59 +00:00
parent 44ffec7a71
commit b97f0d47dc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/android/SessionAccessibility.cpp
View File

@@ -63,9 +63,7 @@ class Settings final
SessionAccessibility::SessionAccessibility( SessionAccessibility::SessionAccessibility(
jni::NativeWeakPtr<widget::GeckoViewSupport> aWindow, jni::NativeWeakPtr<widget::GeckoViewSupport> aWindow,
java::SessionAccessibility::NativeProvider::Param aSessionAccessibility) java::SessionAccessibility::NativeProvider::Param aSessionAccessibility)
: mWindow(aWindow), mSessionAccessibility(aSessionAccessibility) { : mWindow(aWindow), mSessionAccessibility(aSessionAccessibility) {}
SetAttached(true, nullptr);
}
void SessionAccessibility::SetAttached(bool aAttached, void SessionAccessibility::SetAttached(bool aAttached,
already_AddRefed<Runnable> aRunnable) { already_AddRefed<Runnable> aRunnable) {

5
widget/android/nsWindow.cpp
View File

@@ -1997,6 +1997,11 @@ void GeckoViewSupport::AttachAccessibility(
jni::NativeWeakPtrHolder<a11y::SessionAccessibility>::Attach( jni::NativeWeakPtrHolder<a11y::SessionAccessibility>::Attach(
sessionAccessibility, mWindow->mGeckoViewSupport, sessionAccessibility, mWindow->mGeckoViewSupport,
sessionAccessibility); sessionAccessibility);
DispatchToUiThread(
"GeckoViewSupport::AttachAccessibility",
[sa = java::SessionAccessibility::NativeProvider::GlobalRef(
sessionAccessibility)] { sa->SetAttached(true); });
} }
auto GeckoViewSupport::OnLoadRequest(mozilla::jni::String::Param aUri, auto GeckoViewSupport::OnLoadRequest(mozilla::jni::String::Param aUri,