Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix frame going away during submit

Browse Source 
Bug 70572 r=pollmann sr=attinasi
This commit is contained in:
rods%netscape.com 2001-03-13 13:33:59 +00:00
parent 2e80d6b227
commit fba27ca614
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layout/forms/nsFormControlHelper.cpp
View File

@ -958,6 +958,18 @@ nsFormControlHelper::DoManualSubmitOrReset(nsIPresContext* aPresContext,
nsCOMPtr<nsIContent> formContent;
aFormFrame->GetContent(getter_AddRefs(formContent));
// Here we save a pointer to the form control content
// so we can get its frame again after the Shell has processed the event.
//
// Control's Frame may get destroyed during the processing of the event (by the Shell)
// meaning: aFormControlFrame becomes invalid, so instead of using aFormControlFrame
// we use the saved content and the shell to go back and get the frame and
// use it only if it isn't null
nsCOMPtr<nsIContent> controlContent;
if (aDoSubmit && aFormControlFrame != nsnull) {
aFormControlFrame->GetContent(getter_AddRefs(controlContent));
}
nsEventStatus status = nsEventStatus_eIgnore;
if (formContent) {
//Either use the PresShell passed in or go get it from the PresContext
@ -988,7 +1000,13 @@ nsFormControlHelper::DoManualSubmitOrReset(nsIPresContext* aPresContext,
if (NS_SUCCEEDED(result) && formMan) {
// now do the Submit or Reset
if (aDoSubmit) {
formMan->OnSubmit(aPresContext, aFormControlFrame);
// Now go back and get the frame for the control's content
// to make sure it is still valid
nsIFrame* controlFrame;
aPresShell->GetPrimaryFrameFor(controlContent, &controlFrame);
if (controlFrame != nsnull) {
formMan->OnSubmit(aPresContext, controlFrame);
}
} else {
formMan->OnReset(aPresContext);
}

20
layout/html/forms/src/nsFormControlHelper.cpp
View File

@ -958,6 +958,18 @@ nsFormControlHelper::DoManualSubmitOrReset(nsIPresContext* aPresContext,
nsCOMPtr<nsIContent> formContent;
aFormFrame->GetContent(getter_AddRefs(formContent));
// Here we save a pointer to the form control content
// so we can get its frame again after the Shell has processed the event.
//
// Control's Frame may get destroyed during the processing of the event (by the Shell)
// meaning: aFormControlFrame becomes invalid, so instead of using aFormControlFrame
// we use the saved content and the shell to go back and get the frame and
// use it only if it isn't null
nsCOMPtr<nsIContent> controlContent;
if (aDoSubmit && aFormControlFrame != nsnull) {
aFormControlFrame->GetContent(getter_AddRefs(controlContent));
}
nsEventStatus status = nsEventStatus_eIgnore;
if (formContent) {
//Either use the PresShell passed in or go get it from the PresContext
@ -988,7 +1000,13 @@ nsFormControlHelper::DoManualSubmitOrReset(nsIPresContext* aPresContext,
if (NS_SUCCEEDED(result) && formMan) {
// now do the Submit or Reset
if (aDoSubmit) {
formMan->OnSubmit(aPresContext, aFormControlFrame);
// Now go back and get the frame for the control's content
// to make sure it is still valid
nsIFrame* controlFrame;
aPresShell->GetPrimaryFrameFor(controlContent, &controlFrame);
if (controlFrame != nsnull) {
formMan->OnSubmit(aPresContext, controlFrame);
}
} else {
formMan->OnReset(aPresContext);
}