Bug 302356 Crash when drag-scrolling combobox [@ nsIFrame::HasView][@ nsIFrame::GetOffsetTo]

r=roc sr=roc a=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@177290 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2005-08-07 14:35:45 +00:00
parent 13174fbcd7
commit 3f10fd35d8

View File

@ -2715,7 +2715,7 @@ nsListControlFrame::GetIndexFromDOMEvent(nsIDOMEvent* aMouseEvent,
NS_ASSERTION(firstOption, "Can't find first option that's supposed to be there");
nsIFrame* optionFrame;
nsresult rv = presShell->GetPrimaryFrameFor(firstOption, &optionFrame);
if (NS_SUCCEEDED(rv)) {
if (NS_SUCCEEDED(rv) && optionFrame) {
nsPoint ptInOptionFrame = pt - optionFrame->GetOffsetTo(this);
if (ptInOptionFrame.y < 0 && ptInOptionFrame.x >= 0 &&
ptInOptionFrame.x < optionFrame->GetSize().width) {
@ -2729,7 +2729,7 @@ nsListControlFrame::GetIndexFromDOMEvent(nsIDOMEvent* aMouseEvent,
// last option frame
NS_ASSERTION(lastOption, "Can't find last option that's supposed to be there");
rv = presShell->GetPrimaryFrameFor(lastOption, &optionFrame);
if (NS_SUCCEEDED(rv)) {
if (NS_SUCCEEDED(rv) && optionFrame) {
nsPoint ptInOptionFrame = pt - optionFrame->GetOffsetTo(this);
if (ptInOptionFrame.y >= optionFrame->GetSize().height && ptInOptionFrame.x >= 0 &&
ptInOptionFrame.x < optionFrame->GetSize().width) {