mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 307153. Follow up to last checkin with the correct null checks added. r+sr=bryner

This commit is contained in:
aaronleventhal%moonset.net 2005-09-06 19:54:55 +00:00
Родитель f4b600df42
Коммит ba9ccb8b93
1 изменённых файлов: 24 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

43
content/events/src/nsEventStateManager.cpp
Просмотреть файл

@ -4129,18 +4129,21 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
// Make sure we're not switching command dispatchers, if so,
// surpress the blurred one
if(gLastFocusedDocument && mDocument) {
nsIFocusController *newFocusController = nsnull;
nsIFocusController *oldFocusController = nsnull;
nsCOMPtr<nsPIDOMWindow> newWindow =
do_QueryInterface(GetDocumentOuterWindow(mDocument));
nsCOMPtr<nsPIDOMWindow> oldWindow =
do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument));
if(newWindow)
newFocusController = newWindow->GetRootFocusController();
if(oldWindow)
oldFocusController = oldWindow->GetRootFocusController();
if(oldFocusController && oldFocusController != newFocusController)
oldFocusController->SetSuppressFocus(PR_TRUE, "SendFocusBlur Window Switch");
if (newWindow) {
nsIFocusController *newFocusController =
newFocusController = newWindow->GetRootFocusController();
nsCOMPtr<nsPIDOMWindow> oldWindow =
do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument));
if (oldWindow) {
nsIFocusController *oldFocusController =
oldWindow->GetRootFocusController();
if (oldFocusController && oldFocusController != newFocusController) {
oldFocusController->SetSuppressFocus(PR_TRUE, "SendFocusBlur Window Switch");
}
}
}
}
nsCOMPtr<nsIEventStateManager> esm;
@ -4186,18 +4189,20 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
// Make sure we're not switching command dispatchers, if so,
// surpress the blurred one
if (mDocument) {
nsIFocusController *newFocusController = nsnull;
nsIFocusController *oldFocusController = nsnull;
nsCOMPtr<nsPIDOMWindow> newWindow =
do_QueryInterface(GetDocumentOuterWindow(mDocument));
nsCOMPtr<nsPIDOMWindow> oldWindow =
do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument));
if (newWindow)
newFocusController = newWindow->GetRootFocusController();
oldFocusController = oldWindow->GetRootFocusController();
if (oldFocusController && oldFocusController != newFocusController)
oldFocusController->SetSuppressFocus(PR_TRUE, "SendFocusBlur Window Switch #2");
if (newWindow) {
nsCOMPtr<nsPIDOMWindow> oldWindow =
do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument));
nsIFocusController *newFocusController = newWindow->GetRootFocusController();
if (oldWindow) {
nsIFocusController *oldFocusController = oldWindow->GetRootFocusController();
if (oldFocusController && oldFocusController != newFocusController) {
oldFocusController->SetSuppressFocus(PR_TRUE, "SendFocusBlur Window Switch #2");
}
}
}
}
gLastFocusedPresContext->EventStateManager()->SetFocusedContent(nsnull);