Fixes non idle timers. This is fixes a regression caused by the last timer changes. r=rpotts@netscape.com, sr-darin@netscape.com, b=167841.
This commit is contained in:
@@ -2896,7 +2896,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
|
|||||||
prefs->GetIntPref("nglayout.initialpaint.delay", &delay);
|
prefs->GetIntPref("nglayout.initialpaint.delay", &delay);
|
||||||
|
|
||||||
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mPaintSuppressionTimer);
|
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mPaintSuppressionTimer);
|
||||||
ti->SetIdle(PR_TRUE);
|
ti->SetIdle(PR_FALSE);
|
||||||
|
|
||||||
mPaintSuppressionTimer->InitWithFuncCallback(sPaintSuppressionCallback, this, delay,
|
mPaintSuppressionTimer->InitWithFuncCallback(sPaintSuppressionCallback, this, delay,
|
||||||
nsITimer::TYPE_ONE_SHOT);
|
nsITimer::TYPE_ONE_SHOT);
|
||||||
|
|||||||
@@ -2896,7 +2896,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
|
|||||||
prefs->GetIntPref("nglayout.initialpaint.delay", &delay);
|
prefs->GetIntPref("nglayout.initialpaint.delay", &delay);
|
||||||
|
|
||||||
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mPaintSuppressionTimer);
|
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mPaintSuppressionTimer);
|
||||||
ti->SetIdle(PR_TRUE);
|
ti->SetIdle(PR_FALSE);
|
||||||
|
|
||||||
mPaintSuppressionTimer->InitWithFuncCallback(sPaintSuppressionCallback, this, delay,
|
mPaintSuppressionTimer->InitWithFuncCallback(sPaintSuppressionCallback, this, delay,
|
||||||
nsITimer::TYPE_ONE_SHOT);
|
nsITimer::TYPE_ONE_SHOT);
|
||||||
|
|||||||
@@ -535,7 +535,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext,
|
|||||||
mOpenTimer = do_CreateInstance("@mozilla.org/timer;1");
|
mOpenTimer = do_CreateInstance("@mozilla.org/timer;1");
|
||||||
|
|
||||||
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mOpenTimer);
|
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mOpenTimer);
|
||||||
ti->SetIdle(PR_TRUE);
|
ti->SetIdle(PR_FALSE);
|
||||||
|
|
||||||
mOpenTimer->InitWithCallback(this, menuDelay, nsITimer::TYPE_ONE_SHOT);
|
mOpenTimer->InitWithCallback(this, menuDelay, nsITimer::TYPE_ONE_SHOT);
|
||||||
|
|
||||||
|
|||||||
@@ -1502,7 +1502,7 @@ NS_IMETHODIMP nsMenuPopupFrame::SetCurrentMenuItem(nsIMenuFrame* aMenuItem)
|
|||||||
// Kick off the timer.
|
// Kick off the timer.
|
||||||
mCloseTimer = do_CreateInstance("@mozilla.org/timer;1");
|
mCloseTimer = do_CreateInstance("@mozilla.org/timer;1");
|
||||||
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mCloseTimer);
|
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mCloseTimer);
|
||||||
ti->SetIdle(PR_TRUE);
|
ti->SetIdle(PR_FALSE);
|
||||||
mCloseTimer->InitWithCallback(this, menuDelay, nsITimer::TYPE_ONE_SHOT);
|
mCloseTimer->InitWithCallback(this, menuDelay, nsITimer::TYPE_ONE_SHOT);
|
||||||
mTimerMenu = mCurrentMenu;
|
mTimerMenu = mCurrentMenu;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3524,7 +3524,7 @@ nsTreeBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
|
|||||||
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
||||||
|
|
||||||
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mTimer);
|
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mTimer);
|
||||||
ti->SetIdle(PR_TRUE);
|
ti->SetIdle(PR_FALSE);
|
||||||
|
|
||||||
mTimer->InitWithFuncCallback(ScrollCallback, this, kLazyScrollDelay,
|
mTimer->InitWithFuncCallback(ScrollCallback, this, kLazyScrollDelay,
|
||||||
nsITimer::TYPE_REPEATING_SLACK);
|
nsITimer::TYPE_REPEATING_SLACK);
|
||||||
@@ -3565,7 +3565,7 @@ nsTreeBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
|
|||||||
// This node isn't expanded, set a timer to expand it.
|
// This node isn't expanded, set a timer to expand it.
|
||||||
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
||||||
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mTimer);
|
nsCOMPtr<nsITimerInternal> ti = do_QueryInterface(mTimer);
|
||||||
ti->SetIdle(PR_TRUE);
|
ti->SetIdle(PR_FALSE);
|
||||||
mTimer->InitWithFuncCallback(OpenCallback, this, kOpenDelay,
|
mTimer->InitWithFuncCallback(OpenCallback, this, kOpenDelay,
|
||||||
nsITimer::TYPE_ONE_SHOT);
|
nsITimer::TYPE_ONE_SHOT);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user