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

fix for case where when a frame is deleted as a result of a drag (say, moving a bookmark or mail message) we don't try to access the frame after it has been deleted but use |mCurrentTarget| which we know will be up to date and safe. Also check for null in UpdateCursor()...we should have been doing this anyway. r=saari, a=jevering.

This commit is contained in:
pinkerton%netscape.com 2000-02-24 03:41:14 +00:00
Родитель ff62736d77
Коммит 2fa2e1e62e
2 изменённых файлов: 26 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -416,8 +416,13 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
SetClickCount(aPresContext, (nsMouseEvent*)aEvent, aStatus);
break;
case NS_MOUSE_MOVE:
// on the Mac, GenerateDragGesture() may not return until the drag has completed
// and so |aTargetFrame| may have been deleted (moving a bookmark, for example).
// If this is the case, however, we know that ClearFrameRefs() has been called
// and it cleared out |mCurrentTarget|. As a result, we should pass |mCurrentTarget|
// into UpdateCursor().
GenerateDragGesture(aPresContext, aEvent);
UpdateCursor(aPresContext, aEvent, aTargetFrame, aStatus);
UpdateCursor(aPresContext, aEvent, mCurrentTarget, aStatus);
GenerateMouseEnterExit(aPresContext, aEvent);
break;
case NS_MOUSE_EXIT:
@ -1186,7 +1191,8 @@ nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, nsEvent* aEvent,
}
//If not disabled, check for the right cursor.
else {
aTargetFrame->GetCursor(aPresContext, aEvent->point, cursor);
if ( aTargetFrame )
aTargetFrame->GetCursor(aPresContext, aEvent->point, cursor);
}
switch (cursor) {
@ -1234,9 +1240,11 @@ nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, nsEvent* aEvent,
*aStatus = nsEventStatus_eConsumeDoDefault;
}
nsCOMPtr<nsIWidget> window;
aTargetFrame->GetWindow(aPresContext, getter_AddRefs(window));
window->SetCursor(c);
if ( aTargetFrame ) {
nsCOMPtr<nsIWidget> window;
aTargetFrame->GetWindow(aPresContext, getter_AddRefs(window));
window->SetCursor(c);
}
}
void

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

@ -416,8 +416,13 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
SetClickCount(aPresContext, (nsMouseEvent*)aEvent, aStatus);
break;
case NS_MOUSE_MOVE:
// on the Mac, GenerateDragGesture() may not return until the drag has completed
// and so |aTargetFrame| may have been deleted (moving a bookmark, for example).
// If this is the case, however, we know that ClearFrameRefs() has been called
// and it cleared out |mCurrentTarget|. As a result, we should pass |mCurrentTarget|
// into UpdateCursor().
GenerateDragGesture(aPresContext, aEvent);
UpdateCursor(aPresContext, aEvent, aTargetFrame, aStatus);
UpdateCursor(aPresContext, aEvent, mCurrentTarget, aStatus);
GenerateMouseEnterExit(aPresContext, aEvent);
break;
case NS_MOUSE_EXIT:
@ -1186,7 +1191,8 @@ nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, nsEvent* aEvent,
}
//If not disabled, check for the right cursor.
else {
aTargetFrame->GetCursor(aPresContext, aEvent->point, cursor);
if ( aTargetFrame )
aTargetFrame->GetCursor(aPresContext, aEvent->point, cursor);
}
switch (cursor) {
@ -1234,9 +1240,11 @@ nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, nsEvent* aEvent,
*aStatus = nsEventStatus_eConsumeDoDefault;
}
nsCOMPtr<nsIWidget> window;
aTargetFrame->GetWindow(aPresContext, getter_AddRefs(window));
window->SetCursor(c);
if ( aTargetFrame ) {
nsCOMPtr<nsIWidget> window;
aTargetFrame->GetWindow(aPresContext, getter_AddRefs(window));
window->SetCursor(c);
}
}
void