Bug 1918579 - don't crash when dropping with content analysis and focus changes r=masayuki,dlp-reviewers,handyman

Differential Revision: https://phabricator.services.mozilla.com/D222290
This commit is contained in:
Greg Stoll 2024-09-17 14:05:24 +00:00
Родитель df3b9a9478
Коммит 6a003eeb71
2 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

@ -1566,7 +1566,8 @@ void EventStateManager::HandleQueryContentEvent(
// If there is an IMEContentObserver, we need to handle QueryContentEvent
// with it.
if (mIMEContentObserver) {
// eQueryDropTargetHittest is not really an IME event, though
if (mIMEContentObserver && aEvent->mMessage != eQueryDropTargetHittest) {
RefPtr<IMEContentObserver> contentObserver = mIMEContentObserver;
contentObserver->HandleQueryContentEvent(aEvent);
return;

Просмотреть файл

@ -2086,6 +2086,8 @@ mozilla::ipc::IPCResult BrowserChild::RecvStoreDropTargetAndDelayEndDragSession(
mDelayedDropPoint = queryEvent.mRefPoint;
dragSession->StoreDropTargetAndDelayEndDragSession(
queryEvent.mReply->mDropElement, queryEvent.mReply->mDropFrame);
} else {
MOZ_ASSERT(false, "Didn't get reply from eQueryDropTargetHittest event!");
}
return IPC_OK();
}