Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 364544, Crash [@ nsSliderFrame::HandleEvent] when a scrollbar thumb gets removed while dragging, r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@217314 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi 2006-12-21 21:44:10 +00:00
parent 65c9f8fb84
commit 0c12bf4696
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/xul/base/src/nsSliderFrame.cpp
View File

@ -477,6 +477,9 @@ nsSliderFrame::HandleEvent(nsPresContext* aPresContext,
nscoord onePixel = aPresContext->IntScaledPixelsToTwips(1);
nsIFrame* thumbFrame = mFrames.FirstChild();
if (!thumbFrame) {
return NS_OK;
}
// take our current position and subtract the start location
pos -= mDragStart;
@ -567,6 +570,9 @@ nsSliderFrame::HandleEvent(nsPresContext* aPresContext,
// adjust so that the middle of the thumb is placed under the click
nsIFrame* thumbFrame = mFrames.FirstChild();
if (!thumbFrame) {
return NS_OK;
}
nsSize thumbSize = thumbFrame->GetSize();
nscoord thumbLength = isHorizontal ? thumbSize.width : thumbSize.height;
thumbLength /= onePixel;
@ -832,6 +838,9 @@ nsSliderFrame::MouseDown(nsIDOMEvent* aMouseEvent)
// adjust so that the middle of the thumb is placed under the click
nsIFrame* thumbFrame = mFrames.FirstChild();
if (!thumbFrame) {
return NS_OK;
}
nsSize thumbSize = thumbFrame->GetSize();
nscoord thumbLength = isHorizontal ? thumbSize.width : thumbSize.height;
thumbLength /= onePixel;
@ -851,6 +860,9 @@ nsSliderFrame::MouseDown(nsIDOMEvent* aMouseEvent)
DragThumb(PR_TRUE);
nsIFrame* thumbFrame = mFrames.FirstChild();
if (!thumbFrame) {
return NS_OK;
}
if (isHorizontal)
mThumbStart = thumbFrame->GetPosition().x;
@ -1058,6 +1070,10 @@ NS_IMETHODIMP_(void) nsSliderFrame::Notify(nsITimer *timer)
PRBool stop = PR_FALSE;
nsIFrame* thumbFrame = mFrames.FirstChild();
if (!thumbFrame) {
nsRepeatService::GetInstance()->Stop();
return;
}
nsRect thumbRect = thumbFrame->GetRect();
PRBool isHorizontal = IsHorizontal();