bringing branch changes forward

git-svn-id: svn://10.0.0.236/trunk@158277 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-06-21 23:35:56 +00:00
parent e9de5f0bb3
commit ea5334a7ce
40 changed files with 1043 additions and 39 deletions

View File

@@ -2827,14 +2827,7 @@ nsTextControlFrame::FireOnInput()
return;
}
nsCOMPtr<nsIPresContext> context;
presShell->GetPresContext(getter_AddRefs(context));
NS_ASSERTION(context, "No pres context");
if (!context) {
return;
}
presShell->HandleEventWithTarget(&event, nsnull, mContent,
presShell->HandleEventWithTarget(&event, this, mContent,
NS_EVENT_FLAG_INIT, &status);
}
@@ -2871,9 +2864,9 @@ nsTextControlFrame::FireOnChange()
nsWeakPtr &shell = mTextSelImpl->GetPresShell();
nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(shell);
NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
nsCOMPtr<nsIPresContext> context;
if (NS_SUCCEEDED(presShell->GetPresContext(getter_AddRefs(context))) && context)
return presShell->HandleEventWithTarget(&event, nsnull, mContent, NS_EVENT_FLAG_INIT, &status);
return presShell->HandleEventWithTarget(&event, this, mContent,
NS_EVENT_FLAG_INIT, &status);
}
return NS_OK;
}