diff --git a/mozilla/accessible/src/base/nsRootAccessible.cpp b/mozilla/accessible/src/base/nsRootAccessible.cpp index cee85e34d9d..d681621a4d9 100644 --- a/mozilla/accessible/src/base/nsRootAccessible.cpp +++ b/mozilla/accessible/src/base/nsRootAccessible.cpp @@ -379,7 +379,7 @@ NS_IMETHODIMP nsRootAccessible::ScrollPositionDidChange(nsIScrollableView *aScro mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (NS_SUCCEEDED(rv)) { const PRUint32 kScrollPosCheckWait = 50; - mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kScrollPosCheckWait, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kScrollPosCheckWait, PR_TRUE, NS_TYPE_REPEATING_SLACK); } mScrollPositionChangedTicks = 1; mLastScrolledPresShell = weakShell; diff --git a/mozilla/calendar/libxpical/oeICalImpl.cpp b/mozilla/calendar/libxpical/oeICalImpl.cpp index ef94fd49625..f17b4ff4c9f 100644 --- a/mozilla/calendar/libxpical/oeICalImpl.cpp +++ b/mozilla/calendar/libxpical/oeICalImpl.cpp @@ -1702,6 +1702,6 @@ void oeICalImpl::SetupAlarmManager() { if( NS_FAILED( rv ) ) m_alarmtimer = nsnull; else - m_alarmtimer->Init( AlarmTimerCallback, this, timediff*1000, NS_PRIORITY_NORMAL, NS_TYPE_ONE_SHOT ); + m_alarmtimer->Init( AlarmTimerCallback, this, timediff*1000, PR_TRUE, NS_TYPE_ONE_SHOT ); } } diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index f3b5c33be02..cd3ccaeedb7 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -787,7 +787,7 @@ public: if (NS_FAILED(result)) { NS_WARNING("unable to start the timer"); } else { - mTimer->Init(this, aUseDelay?mDelay:0, NS_PRIORITY_NORMAL, NS_TYPE_ONE_SHOT); + mTimer->Init(this, aUseDelay?mDelay:0, PR_TRUE, NS_TYPE_ONE_SHOT); } return result; } diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 2160287eb1f..aa5d13cbe71 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -978,7 +978,7 @@ nsEventStateManager :: CreateClickHoldTimer ( nsIPresContext* inPresContext, nsG mClickHoldTimer = do_CreateInstance("@mozilla.org/timer;1"); if ( mClickHoldTimer ) - mClickHoldTimer->Init(sClickHoldCallback, this, kClickHoldDelay, NS_PRIORITY_HIGH); + mClickHoldTimer->Init(sClickHoldCallback, this, kClickHoldDelay, PR_TRUE); mEventPoint = inMouseDownEvent->point; mEventRefPoint = inMouseDownEvent->refPoint; diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index b5e3c465483..ab3cd3cca3b 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -4339,7 +4339,7 @@ GlobalWindowImpl::SetTimeoutOrInterval(PRBool aIsInterval, PRInt32 *aReturn) } err = timeout->timer->Init(TimerCallback, timeout, (PRInt32)interval, - NS_PRIORITY_LOWEST); + PR_FALSE); if (NS_OK != err) { DropTimeout(timeout); return err; @@ -4577,7 +4577,7 @@ GlobalWindowImpl::RunTimeout(nsTimeoutImpl *aTimeout) if (timeout->timer) { rv = timeout->timer->Init(TimerCallback, timeout, delay32, - NS_PRIORITY_LOWEST); + PR_TRUE); // Likewise, don't return early even if we fail to // initialize the new OS timer. diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 015c78aacae..f7dbfbe3926 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -1627,7 +1627,7 @@ nsJSContext::FireGCTimer() static PRBool first = PR_TRUE; sGCTimer->Init(this, first ? NS_FIRST_GC_DELAY : NS_GC_DELAY, - NS_PRIORITY_LOWEST); + PR_TRUE); first = PR_FALSE; } diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index 5319d3f0651..7af605a8618 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -1202,7 +1202,7 @@ ChromeTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent) if ( eventTarget ) mPossibleTooltipNode = do_QueryInterface(eventTarget); if ( mPossibleTooltipNode ) { - nsresult rv = mTooltipTimer->Init(sTooltipCallback, this, kTooltipShowTime, NS_PRIORITY_HIGH); + nsresult rv = mTooltipTimer->Init(sTooltipCallback, this, kTooltipShowTime, PR_TRUE); if (NS_FAILED(rv)) mPossibleTooltipNode = nsnull; } @@ -1334,7 +1334,7 @@ ChromeTooltipListener :: CreateAutoHideTimer ( ) mAutoHideTimer = do_CreateInstance("@mozilla.org/timer;1"); if ( mAutoHideTimer ) - mAutoHideTimer->Init(sAutoHideCallback, this, kTooltipAutoHideTime, NS_PRIORITY_HIGH); + mAutoHideTimer->Init(sAutoHideCallback, this, kTooltipAutoHideTime, PR_TRUE); } // CreateAutoHideTimer diff --git a/mozilla/extensions/inspector/base/src/inSearchLoop.cpp b/mozilla/extensions/inspector/base/src/inSearchLoop.cpp index 0df817367c3..6afc03f3d87 100644 --- a/mozilla/extensions/inspector/base/src/inSearchLoop.cpp +++ b/mozilla/extensions/inspector/base/src/inSearchLoop.cpp @@ -59,7 +59,7 @@ inSearchLoop::~inSearchLoop() nsresult inSearchLoop::Start() { - mTimer->Init(inSearchLoop::TimerCallback, (void*)this, 0, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + mTimer->Init(inSearchLoop::TimerCallback, (void*)this, 0, PR_TRUE, NS_TYPE_REPEATING_SLACK); return NS_OK; } diff --git a/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp b/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp index d1def878d1f..6384b3f4846 100644 --- a/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp +++ b/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp @@ -379,7 +379,7 @@ nsresult nsAutoConfig::downloadAutoConfig() mTimer = do_CreateInstance("@mozilla.org/timer;1",&rv); if (NS_FAILED(rv)) return rv; - rv = mTimer->Init(this, minutes * 60 * 1000, NS_PRIORITY_NORMAL, + rv = mTimer->Init(this, minutes * 60 * 1000, PR_TRUE, NS_TYPE_REPEATING_SLACK); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp index 017d73af601..ec750bd0bd4 100644 --- a/mozilla/layout/base/nsCaret.cpp +++ b/mozilla/layout/base/nsCaret.cpp @@ -467,7 +467,7 @@ nsresult nsCaret::PrimeTimer() if (NS_FAILED(err)) return err; - mBlinkTimer->Init(CaretBlinkCallback, this, mBlinkRate, NS_PRIORITY_HIGH, NS_TYPE_REPEATING_PRECISE); + mBlinkTimer->Init(CaretBlinkCallback, this, mBlinkRate, PR_TRUE, NS_TYPE_REPEATING_PRECISE); } return NS_OK; diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index f3b5c33be02..cd3ccaeedb7 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -787,7 +787,7 @@ public: if (NS_FAILED(result)) { NS_WARNING("unable to start the timer"); } else { - mTimer->Init(this, aUseDelay?mDelay:0, NS_PRIORITY_NORMAL, NS_TYPE_ONE_SHOT); + mTimer->Init(this, aUseDelay?mDelay:0, PR_TRUE, NS_TYPE_ONE_SHOT); } return result; } diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 02e80e66e99..07f1667feb2 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -2914,7 +2914,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight) nsCOMPtr prefs(do_GetService(kPrefServiceCID)); if (prefs) prefs->GetIntPref("nglayout.initialpaint.delay", &delay); - mPaintSuppressionTimer->Init(sPaintSuppressionCallback, this, delay, NS_PRIORITY_HIGHEST); + mPaintSuppressionTimer->Init(sPaintSuppressionCallback, this, delay, PR_FALSE); } } @@ -3051,7 +3051,7 @@ PresShell::CreateResizeEventTimer () mResizeEventTimer = do_CreateInstance("@mozilla.org/timer;1"); if (mResizeEventTimer) { - mResizeEventTimer->Init(sResizeEventCallback, this, RESIZE_EVENT_DELAY, NS_PRIORITY_HIGH); + mResizeEventTimer->Init(sResizeEventCallback, this, RESIZE_EVENT_DELAY, PR_TRUE); } } diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp index 017d73af601..ec750bd0bd4 100644 --- a/mozilla/layout/base/src/nsCaret.cpp +++ b/mozilla/layout/base/src/nsCaret.cpp @@ -467,7 +467,7 @@ nsresult nsCaret::PrimeTimer() if (NS_FAILED(err)) return err; - mBlinkTimer->Init(CaretBlinkCallback, this, mBlinkRate, NS_PRIORITY_HIGH, NS_TYPE_REPEATING_PRECISE); + mBlinkTimer->Init(CaretBlinkCallback, this, mBlinkRate, PR_TRUE, NS_TYPE_REPEATING_PRECISE); } return NS_OK; diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index fe7e35f29e2..4edfbb15aed 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -3791,7 +3791,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void) // start a periodic timer to provide null events to the plugin instance. mPluginTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (rv == NS_OK) - rv = mPluginTimer->Init(this, 1020 / 60, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + rv = mPluginTimer->Init(this, 1020 / 60, PR_TRUE, NS_TYPE_REPEATING_SLACK); #endif } } diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 4e8c28b7ec3..fa5285392a9 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -275,7 +275,7 @@ void nsBlinkTimer::Start() nsresult rv; mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (NS_OK == rv) { - mTimer->Init(this, 750, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_PRECISE); + mTimer->Init(this, 750, PR_TRUE, NS_TYPE_REPEATING_PRECISE); } } diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index fe7e35f29e2..4edfbb15aed 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -3791,7 +3791,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void) // start a periodic timer to provide null events to the plugin instance. mPluginTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (rv == NS_OK) - rv = mPluginTimer->Init(this, 1020 / 60, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + rv = mPluginTimer->Init(this, 1020 / 60, PR_TRUE, NS_TYPE_REPEATING_SLACK); #endif } } diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 02e80e66e99..07f1667feb2 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -2914,7 +2914,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight) nsCOMPtr prefs(do_GetService(kPrefServiceCID)); if (prefs) prefs->GetIntPref("nglayout.initialpaint.delay", &delay); - mPaintSuppressionTimer->Init(sPaintSuppressionCallback, this, delay, NS_PRIORITY_HIGHEST); + mPaintSuppressionTimer->Init(sPaintSuppressionCallback, this, delay, PR_FALSE); } } @@ -3051,7 +3051,7 @@ PresShell::CreateResizeEventTimer () mResizeEventTimer = do_CreateInstance("@mozilla.org/timer;1"); if (mResizeEventTimer) { - mResizeEventTimer->Init(sResizeEventCallback, this, RESIZE_EVENT_DELAY, NS_PRIORITY_HIGH); + mResizeEventTimer->Init(sResizeEventCallback, this, RESIZE_EVENT_DELAY, PR_TRUE); } } diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 4e8c28b7ec3..fa5285392a9 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -275,7 +275,7 @@ void nsBlinkTimer::Start() nsresult rv; mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (NS_OK == rv) { - mTimer->Init(this, 750, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_PRECISE); + mTimer->Init(this, 750, PR_TRUE, NS_TYPE_REPEATING_PRECISE); } } diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 3f4744733c2..5238101f8a0 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -535,7 +535,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext, // We're a menu, we're built, we're closed, and no timer has been kicked off. mOpenTimer = do_CreateInstance("@mozilla.org/timer;1"); - mOpenTimer->Init(this, menuDelay, NS_PRIORITY_HIGHEST); + mOpenTimer->Init(this, menuDelay, PR_FALSE); } } diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp index fb287a827d8..5f04ba7d6d4 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -1496,7 +1496,7 @@ NS_IMETHODIMP nsMenuPopupFrame::SetCurrentMenuItem(nsIMenuFrame* aMenuItem) // Kick off the timer. mCloseTimer = do_CreateInstance("@mozilla.org/timer;1"); - mCloseTimer->Init(this, menuDelay, NS_PRIORITY_HIGHEST); + mCloseTimer->Init(this, menuDelay, PR_FALSE); mTimerMenu = mCurrentMenu; } } diff --git a/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp b/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp index a388123821f..3f02c673396 100644 --- a/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp +++ b/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp @@ -195,7 +195,7 @@ nsXULTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent) mTargetNode = targetContent; } if (mTargetNode) { - nsresult rv = mTooltipTimer->Init(sTooltipCallback, this, kTooltipShowTime, NS_PRIORITY_HIGH); + nsresult rv = mTooltipTimer->Init(sTooltipCallback, this, kTooltipShowTime, PR_TRUE); if (NS_FAILED(rv)) mTargetNode = nsnull; } @@ -650,7 +650,7 @@ nsXULTooltipListener::CreateAutoHideTimer() mAutoHideTimer = do_CreateInstance("@mozilla.org/timer;1"); if ( mAutoHideTimer ) - mAutoHideTimer->Init(sAutoHideCallback, this, kTooltipAutoHideTime, NS_PRIORITY_HIGH); + mAutoHideTimer->Init(sAutoHideCallback, this, kTooltipAutoHideTime, PR_TRUE); } void diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index a6a641b5f0e..d3a867ac7f8 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -3508,7 +3508,7 @@ nsTreeBodyFrame::OnDragOver(nsIDOMEvent* aEvent) if (!isOpen) { // this node isn't expanded - set a timer to expand it mOpenTimer = do_CreateInstance("@mozilla.org/timer;1"); - mOpenTimer->Init(this, 1000, NS_PRIORITY_HIGHEST); + mOpenTimer->Init(this, 1000, PR_FALSE); } } } diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp index f0f046e497b..29e3838056e 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp @@ -317,7 +317,7 @@ NS_IMETHODIMP nsTreeSelection::TimedSelect(PRInt32 aIndex, PRInt32 aMsec) mSelectTimer->Cancel(); mSelectTimer = do_CreateInstance("@mozilla.org/timer;1"); - mSelectTimer->Init(SelectCallback, this, aMsec, NS_PRIORITY_HIGH); + mSelectTimer->Init(SelectCallback, this, aMsec, PR_TRUE); } } diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchSession.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchSession.cpp index 20b66336ba6..f75b39bf275 100644 --- a/mozilla/mailnews/base/search/src/nsMsgSearchSession.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgSearchSession.cpp @@ -527,7 +527,7 @@ nsresult nsMsgSearchSession::StartTimer() PRBool done; m_backgroundTimer = do_CreateInstance("@mozilla.org/timer;1", &err); - m_backgroundTimer->Init(TimerCallback, (void *) this, 0, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + m_backgroundTimer->Init(TimerCallback, (void *) this, 0, PR_TRUE, NS_TYPE_REPEATING_SLACK); // ### start meteors? return TimeSlice(&done); } diff --git a/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp b/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp index 37262a733a0..94431c8d9bc 100644 --- a/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp +++ b/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp @@ -1161,7 +1161,7 @@ nsMessengerWinIntegration::SetupUnreadCountUpdateTimer() } mUnreadCountUpdateTimer = do_CreateInstance("@mozilla.org/timer;1"); - mUnreadCountUpdateTimer->Init(OnUnreadCountUpdateTimer, (void*)this, timeInMSUint32, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + mUnreadCountUpdateTimer->Init(OnUnreadCountUpdateTimer, (void*)this, timeInMSUint32, PR_TRUE, NS_TYPE_REPEATING_SLACK); return NS_OK; } diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp index 71117de1a08..c54d1cb234d 100644 --- a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp @@ -302,7 +302,7 @@ nsresult nsNntpIncomingServer::SetupNewsrcSaveTimer() mNewsrcSaveTimer->Cancel(); } mNewsrcSaveTimer = do_CreateInstance("@mozilla.org/timer;1"); - mNewsrcSaveTimer->Init(OnNewsrcSaveTimer, (void*)this, timeInMSUint32, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + mNewsrcSaveTimer->Init(OnNewsrcSaveTimer, (void*)this, timeInMSUint32, PR_TRUE, NS_TYPE_REPEATING_SLACK); return NS_OK; } diff --git a/mozilla/modules/libpr0n/src/imgContainer.cpp b/mozilla/modules/libpr0n/src/imgContainer.cpp index d0d422eb8e6..ac9ab0b365b 100644 --- a/mozilla/modules/libpr0n/src/imgContainer.cpp +++ b/mozilla/modules/libpr0n/src/imgContainer.cpp @@ -199,7 +199,7 @@ NS_IMETHODIMP imgContainer::AppendFrame(gfxIImageFrame *item) // Since we have more than one frame we need a timer mTimer = do_CreateInstance("@mozilla.org/timer;1"); mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), - timeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + timeout, PR_TRUE, NS_TYPE_REPEATING_SLACK); } } } @@ -322,7 +322,7 @@ NS_IMETHODIMP imgContainer::StartAnimation() if (!mTimer) mTimer = do_CreateInstance("@mozilla.org/timer;1"); mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), - timeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + timeout, PR_TRUE, NS_TYPE_REPEATING_SLACK); } } else { // XXX hack.. the timer notify code will do the right thing, so just get that started @@ -330,7 +330,7 @@ NS_IMETHODIMP imgContainer::StartAnimation() if (!mTimer) mTimer = do_CreateInstance("@mozilla.org/timer;1"); mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), - 100, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + 100, PR_TRUE, NS_TYPE_REPEATING_SLACK); } } diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp index 438db3a3321..34667371443 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp @@ -319,7 +319,7 @@ nsFtpProtocolHandler::InsertConnection(nsIURI *aKey, nsISupports *aConn) rv = timer->Init(nsFtpProtocolHandler::Timeout, ts, mIdleTimeout*1000, - NS_PRIORITY_LOW); + PR_TRUE); if (NS_FAILED(rv)) { delete ts; return rv; diff --git a/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp index a68fa785686..33a1f16162e 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp @@ -270,7 +270,7 @@ nsHttpHandler::Init() // may not be cleaned up as aggressively. if (mTimer) mTimer->Init(DeadConnectionCleanupCB, this, 15*1000, // 15 seconds - NS_PRIORITY_NORMAL, + PR_TRUE, NS_TYPE_REPEATING_SLACK); return NS_OK; diff --git a/mozilla/webshell/tests/viewer/nsThrobber.cpp b/mozilla/webshell/tests/viewer/nsThrobber.cpp index dda386b3562..93d7068e8bf 100644 --- a/mozilla/webshell/tests/viewer/nsThrobber.cpp +++ b/mozilla/webshell/tests/viewer/nsThrobber.cpp @@ -364,7 +364,7 @@ nsThrobber::LoadThrobberImages(const nsString& aFileNameMask, PRInt32 aNumImages if (NS_OK != rv) { return rv; } - mTimer->Init(ThrobTimerCallback, this, 33, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK); + mTimer->Init(ThrobTimerCallback, this, 33, PR_TRUE, NS_TYPE_REPEATING_SLACK); char * mask = ToNewCString(aFileNameMask); for (PRInt32 cnt = 0; cnt < mNumImages; cnt++) diff --git a/mozilla/widget/src/cocoa/nsSound.cpp b/mozilla/widget/src/cocoa/nsSound.cpp index 1f6894248a2..ba9d276b6af 100644 --- a/mozilla/widget/src/cocoa/nsSound.cpp +++ b/mozilla/widget/src/cocoa/nsSound.cpp @@ -601,7 +601,7 @@ nsSystemSoundRequest::PlaySound() const PRInt32 kSoundTimerInterval = 250; // 250 milliseconds rv = mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kSoundTimerInterval, - NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_PRECISE); + PR_TRUE, NS_TYPE_REPEATING_PRECISE); if (NS_FAILED(rv)) { Cleanup(); return rv; @@ -805,7 +805,7 @@ nsMovieSoundRequest::PlaySound() const PRInt32 kMovieTimerInterval = 250; // 250 milliseconds rv = mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kMovieTimerInterval, - NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_PRECISE); + PR_TRUE, NS_TYPE_REPEATING_PRECISE); if (NS_FAILED(rv)) { Cleanup(); return rv; diff --git a/mozilla/widget/src/mac/nsSound.cpp b/mozilla/widget/src/mac/nsSound.cpp index 05545f415aa..47645bcee48 100644 --- a/mozilla/widget/src/mac/nsSound.cpp +++ b/mozilla/widget/src/mac/nsSound.cpp @@ -599,7 +599,7 @@ nsSystemSoundRequest::PlaySound() const PRInt32 kSoundTimerInterval = 250; // 250 milliseconds rv = mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kSoundTimerInterval, - NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_PRECISE); + PR_TRUE, NS_TYPE_REPEATING_PRECISE); if (NS_FAILED(rv)) { Cleanup(); return rv; @@ -855,7 +855,7 @@ nsMovieSoundRequest::PlaySound() const PRInt32 kMovieTimerInterval = 250; // 250 milliseconds rv = mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kMovieTimerInterval, - NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_PRECISE); + PR_TRUE, NS_TYPE_REPEATING_PRECISE); if (NS_FAILED(rv)) { Cleanup(); return rv; diff --git a/mozilla/xpcom/ds/nsRecyclingAllocator.cpp b/mozilla/xpcom/ds/nsRecyclingAllocator.cpp index 52de2c92b4d..59261cc5f94 100644 --- a/mozilla/xpcom/ds/nsRecyclingAllocator.cpp +++ b/mozilla/xpcom/ds/nsRecyclingAllocator.cpp @@ -236,7 +236,7 @@ nsRecyclingAllocator::Malloc(PRUint32 bytes, PRBool zeroit) if (mNAllocations && !mRecycleTimer) { (void) NS_NewTimer(&mRecycleTimer, nsRecycleTimerCallback, this, - NS_SEC_TO_MS(mRecycleAfter), NS_PRIORITY_LOWEST, + NS_SEC_TO_MS(mRecycleAfter), PR_TRUE, NS_TYPE_REPEATING_SLACK); } return ptr; diff --git a/mozilla/xpcom/threads/nsIScriptableTimer.idl b/mozilla/xpcom/threads/nsIScriptableTimer.idl index 1e8431ebe10..d685eac8470 100644 --- a/mozilla/xpcom/threads/nsIScriptableTimer.idl +++ b/mozilla/xpcom/threads/nsIScriptableTimer.idl @@ -50,13 +50,6 @@ [scriptable,uuid(84271f22-c023-4b01-8050-d71c0c6a6235)] interface nsIScriptableTimer : nsISupports { - /* Timer priorities */ - const short PRIORITY_HIGHEST = 10; - const short PRIORITY_HIGH = 8; - const short PRIORITY_NORMAL = 5; - const short PRIORITY_LOW = 2; - const short PRIORITY_LOWEST = 0; - /* Timer types */ const short TYPE_ONE_SHOT = 0; const short TYPE_REPEATING_SLACK = 1; @@ -76,11 +69,11 @@ interface nsIScriptableTimer : nsISupports * wstring data => null * * @param aDelay delay in milliseconds for timer to fire - * @param aPriority timer priority per PRIORITY* consts defined above + * @param aIdle whether the timer is an idle timer * @param aType timer type per TYPE* consts defined above */ void init(in nsIObserver aObserver, in unsigned long aDelay, - in unsigned long aPriority, in unsigned long aType); + in boolean aIdle, in unsigned long aType); /** * Cancellation of timers applies to repeating timers diff --git a/mozilla/xpcom/threads/nsITimer.h b/mozilla/xpcom/threads/nsITimer.h index 97c05771259..890cc0be145 100644 --- a/mozilla/xpcom/threads/nsITimer.h +++ b/mozilla/xpcom/threads/nsITimer.h @@ -67,14 +67,6 @@ typedef void { 0x497eed20, 0xb740, 0x11d1, \ { 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } } -// --- Timer priorities --- -// These are going away, so just use NORMAL for now. See bug 115473 -#define NS_PRIORITY_HIGHEST 10 -#define NS_PRIORITY_HIGH 8 -#define NS_PRIORITY_NORMAL 5 -#define NS_PRIORITY_LOW 2 -#define NS_PRIORITY_LOWEST 0 - // --- Timer types --- enum nsTimerType { /** @@ -121,14 +113,14 @@ public: * @param aFunc - The function to invoke * @param aClosure - an opaque pointer to pass to that function * @param aDelay - The millisecond interval - * @param aPriority - The timer priority + * @param aIdle - Whether this is an idle timer * @param aType - The timer type : one shot or repeating * @result - NS_OK if this operation was successful */ NS_IMETHOD Init(nsTimerCallbackFunc aFunc, void *aClosure, PRUint32 aDelay, - PRUint32 aPriority = NS_PRIORITY_NORMAL, + PRBool aIdle = PR_TRUE, PRUint32 aType = NS_TYPE_ONE_SHOT) = 0; /** @@ -138,35 +130,35 @@ public: * * @param aCallback - The interface to notify * @param aDelay - The millisecond interval - * @param aPriority - The timer priority + * @param aIdle - Whether this is an idle timer * @param aType - The timer type : one shot or repeating * @result - NS_OK if this operation was successful */ NS_IMETHOD Init(nsITimerCallback *aCallback, PRUint32 aDelay, - PRUint32 aPriority = NS_PRIORITY_NORMAL, + PRBool aIdle = PR_TRUE, PRUint32 aType = NS_TYPE_ONE_SHOT) = 0; /// Cancels the timeout NS_IMETHOD Cancel() = 0; + /// @return true if the timer is an idle timer, false otherwise + NS_IMETHOD_(PRBool) IsIdle() const = 0; + /// @return the millisecond delay of the timeout - NS_IMETHOD_(PRUint32) GetDelay() = 0; + NS_IMETHOD_(PRUint32) GetDelay() const = 0; /// Change the millisecond interval for the timeout NS_IMETHOD_(void) SetDelay(PRUint32 aDelay) = 0; - NS_IMETHOD_(PRUint32) GetPriority() = 0; - NS_IMETHOD_(void) SetPriority(PRUint32 aPriority) = 0; - - NS_IMETHOD_(PRUint32) GetType() = 0; + NS_IMETHOD_(PRUint32) GetType() const = 0; NS_IMETHOD_(void) SetType(PRUint32 aType) = 0; /// @return the opaque pointer - NS_IMETHOD_(void*) GetClosure() = 0; + NS_IMETHOD_(void*) GetClosure() const = 0; }; extern NS_COM nsresult NS_NewTimer(nsITimer* *aResult, nsTimerCallbackFunc aCallback, void *aClosure, - PRUint32 aDelay, PRUint32 aPriority, PRUint32 aType); + PRUint32 aDelay, PRBool aIdle, PRUint32 aType); #endif // nsITimer_h___ diff --git a/mozilla/xpcom/threads/nsTimerImpl.cpp b/mozilla/xpcom/threads/nsTimerImpl.cpp index cfdc49812e5..a5af3dd927f 100644 --- a/mozilla/xpcom/threads/nsTimerImpl.cpp +++ b/mozilla/xpcom/threads/nsTimerImpl.cpp @@ -209,7 +209,7 @@ void nsTimerImpl::Shutdown() NS_IMETHODIMP nsTimerImpl::Init(nsTimerCallbackFunc aFunc, void *aClosure, PRUint32 aDelay, - PRUint32 aPriority, + PRBool aIdle, PRUint32 aType) { if (!gThread) @@ -220,7 +220,7 @@ NS_IMETHODIMP nsTimerImpl::Init(nsTimerCallbackFunc aFunc, mClosure = aClosure; - mPriority = (PRUint8)aPriority; + mIdle = aIdle; mType = (PRUint8)aType; SetDelayInternal(aDelay); @@ -230,7 +230,7 @@ NS_IMETHODIMP nsTimerImpl::Init(nsTimerCallbackFunc aFunc, NS_IMETHODIMP nsTimerImpl::Init(nsITimerCallback *aCallback, PRUint32 aDelay, - PRUint32 aPriority, + PRBool aIdle, PRUint32 aType) { if (!gThread) @@ -240,7 +240,7 @@ NS_IMETHODIMP nsTimerImpl::Init(nsITimerCallback *aCallback, NS_ADDREF(mCallback.i); mCallbackType = CALLBACK_TYPE_INTERFACE; - mPriority = (PRUint8)aPriority; + mIdle = aIdle; mType = (PRUint8)aType; SetDelayInternal(aDelay); @@ -250,7 +250,7 @@ NS_IMETHODIMP nsTimerImpl::Init(nsITimerCallback *aCallback, NS_IMETHODIMP nsTimerImpl::Init(nsIObserver *aObserver, PRUint32 aDelay, - PRUint32 aPriority, + PRBool aIdle, PRUint32 aType) { if (!gThread) @@ -262,7 +262,7 @@ NS_IMETHODIMP nsTimerImpl::Init(nsIObserver *aObserver, NS_ADDREF(mCallback.o); mCallbackType = CALLBACK_TYPE_OBSERVER; - mPriority = (PRUint8)aPriority; + mIdle = aIdle; mType = (PRUint8)aType; return gThread->AddTimer(this); @@ -291,11 +291,6 @@ NS_IMETHODIMP_(void) nsTimerImpl::SetDelay(PRUint32 aDelay) gThread->TimerDelayChanged(this); } -NS_IMETHODIMP_(void) nsTimerImpl::SetPriority(PRUint32 aPriority) -{ - mPriority = (PRUint8)aPriority; -} - NS_IMETHODIMP_(void) nsTimerImpl::SetType(PRUint32 aType) { mType = (PRUint8)aType; @@ -393,7 +388,7 @@ void* handleTimerEvent(TimerEventType* event) #endif if (gFireOnIdle) { - if (NS_STATIC_CAST(nsTimerImpl*, event->e.owner)->GetPriority() < NS_PRIORITY_HIGHEST) { + if (NS_STATIC_CAST(nsTimerImpl*, event->e.owner)->IsIdle()) { nsCOMPtr currentThread, mainThread; nsIThread::GetCurrent(getter_AddRefs(currentThread)); nsIThread::GetMainThread(getter_AddRefs(mainThread)); @@ -487,14 +482,14 @@ void nsTimerImpl::SetDelayInternal(PRUint32 aDelay) nsresult NS_NewTimer(nsITimer* *aResult, nsTimerCallbackFunc aCallback, void *aClosure, - PRUint32 aDelay, PRUint32 aPriority, PRUint32 aType) + PRUint32 aDelay, PRBool aIdle, PRUint32 aType) { nsTimerImpl* timer = new nsTimerImpl(); if (timer == nsnull) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(timer); - nsresult rv = timer->Init(aCallback, aClosure, aDelay, aPriority, aType); + nsresult rv = timer->Init(aCallback, aClosure, aDelay, aIdle, aType); if (NS_FAILED(rv)) { NS_RELEASE(timer); return rv; diff --git a/mozilla/xpcom/threads/nsTimerImpl.h b/mozilla/xpcom/threads/nsTimerImpl.h index 78fa00babbd..470644a3d7e 100644 --- a/mozilla/xpcom/threads/nsTimerImpl.h +++ b/mozilla/xpcom/threads/nsTimerImpl.h @@ -100,27 +100,26 @@ public: NS_IMETHOD Init(nsTimerCallbackFunc aFunc, void *aClosure, PRUint32 aDelay, - PRUint32 aPriority, + PRBool aIdle, PRUint32 aType); NS_IMETHOD Init(nsITimerCallback *aCallback, PRUint32 aDelay, - PRUint32 aPriority, + PRBool aIdle, PRUint32 aType); NS_DECL_ISUPPORTS NS_DECL_NSISCRIPTABLETIMER - NS_IMETHOD_(PRUint32) GetDelay() { return mDelay; } + NS_IMETHOD_(PRBool) IsIdle() const { return mIdle; } + + NS_IMETHOD_(PRUint32) GetDelay() const { return mDelay; } NS_IMETHOD_(void) SetDelay(PRUint32 aDelay); - NS_IMETHOD_(PRUint32) GetPriority() { return mPriority; } - NS_IMETHOD_(void) SetPriority(PRUint32 aPriority); - - NS_IMETHOD_(PRUint32) GetType() { return (PRUint32)mType; } + NS_IMETHOD_(PRUint32) GetType() const { return (PRUint32)mType; } NS_IMETHOD_(void) SetType(PRUint32 aType); - NS_IMETHOD_(void*) GetClosure() { return mClosure; } + NS_IMETHOD_(void*) GetClosure() const { return mClosure; } private: nsCOMPtr mCallingThread; @@ -135,7 +134,7 @@ private: // These members are set by Init (called from NS_NewTimer) and never reset. PRUint8 mCallbackType; - PRUint8 mPriority; + PRPackedBool mIdle; // These members are set by the initiating thread, when the timer's type is // changed and during the period where it fires on that thread. diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 0dbc4d9b4b7..d3b56c3eb57 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1817,7 +1817,7 @@ nsBookmarksService::Init() mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create a timer"); if (NS_FAILED(rv)) return rv; - mTimer->Init(nsBookmarksService::FireTimer, this, BOOKMARK_TIMEOUT, NS_PRIORITY_LOWEST, NS_TYPE_REPEATING_SLACK); + mTimer->Init(nsBookmarksService::FireTimer, this, BOOKMARK_TIMEOUT, PR_TRUE, NS_TYPE_REPEATING_SLACK); // Note: don't addref "this" as we'll cancel the timer in the nsBookmarkService destructor } @@ -2137,7 +2137,7 @@ else } bmks->mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (NS_FAILED(rv) || (!bmks->mTimer)) return; - bmks->mTimer->Init(nsBookmarksService::FireTimer, bmks, BOOKMARK_TIMEOUT, NS_PRIORITY_LOWEST, NS_TYPE_REPEATING_SLACK); + bmks->mTimer->Init(nsBookmarksService::FireTimer, bmks, BOOKMARK_TIMEOUT, PR_TRUE, NS_TYPE_REPEATING_SLACK); // Note: don't addref "this" as we'll cancel the timer in the nsBookmarkService destructor #endif } diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index 4aca993bae5..5de3a4edc0b 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -928,7 +928,7 @@ nsHTTPIndex::GetTargets(nsIRDFResource *aSource, nsIRDFResource *aProperty, PRBo if (NS_SUCCEEDED(rv)) { mTimer->Init(nsHTTPIndex::FireTimer, this, 1, - NS_PRIORITY_LOWEST, NS_TYPE_ONE_SHOT); + PR_TRUE, NS_TYPE_ONE_SHOT); // Note: don't addref "this" as we'll cancel the // timer in the httpIndex destructor } @@ -964,7 +964,7 @@ nsHTTPIndex::AddElement(nsIRDFResource *parent, nsIRDFResource *prop, nsIRDFNode if (NS_FAILED(rv)) return(rv); mTimer->Init(nsHTTPIndex::FireTimer, this, 1, - NS_PRIORITY_LOWEST, NS_TYPE_ONE_SHOT); + PR_TRUE, NS_TYPE_ONE_SHOT); // Note: don't addref "this" as we'll cancel the // timer in the httpIndex destructor } @@ -1105,7 +1105,7 @@ nsHTTPIndex::FireTimer(nsITimer* aTimer, void* aClosure) if (httpIndex->mTimer) { httpIndex->mTimer->Init(nsHTTPIndex::FireTimer, aClosure, 10, - NS_PRIORITY_LOWEST, NS_TYPE_ONE_SHOT); + PR_TRUE, NS_TYPE_ONE_SHOT); // Note: don't addref "this" as we'll cancel the // timer in the httpIndex destructor } diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index 073488f7530..49e76582d6b 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -1728,7 +1728,7 @@ nsGlobalHistory::SetDirty() mDirty = PR_TRUE; mSyncTimer->Init(fireSyncTimer, this, HISTORY_SYNC_TIMEOUT, - NS_PRIORITY_LOWEST, NS_TYPE_ONE_SHOT); + PR_TRUE, NS_TYPE_ONE_SHOT); return NS_OK; @@ -1747,7 +1747,7 @@ nsGlobalHistory::GetNow() if (mExpireNowTimer) mExpireNowTimer->Init(expireNowTimer, this, HISTORY_EXPIRE_NOW_TIMEOUT, - NS_PRIORITY_LOWEST, NS_TYPE_ONE_SHOT); + PR_TRUE, NS_TYPE_ONE_SHOT); } return mLastNow; diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp index 3e04a07aea8..2971592e114 100755 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp @@ -721,7 +721,7 @@ else search->mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); if (NS_FAILED(rv) || (!search->mTimer)) return; search->mTimer->Init(InternetSearchDataSource::FireTimer, search, - SEARCH_UPDATE_TIMEOUT, NS_PRIORITY_LOWEST, NS_TYPE_REPEATING_SLACK); + SEARCH_UPDATE_TIMEOUT, PR_TRUE, NS_TYPE_REPEATING_SLACK); // Note: don't addref "this" as we'll cancel the timer in the InternetSearchDataSource destructor #endif } @@ -924,7 +924,7 @@ InternetSearchDataSource::Init() if (mTimer) { mTimer->Init(InternetSearchDataSource::FireTimer, this, - SEARCH_UPDATE_TIMEOUT, NS_PRIORITY_LOWEST, NS_TYPE_REPEATING_SLACK); + SEARCH_UPDATE_TIMEOUT, PR_TRUE, NS_TYPE_REPEATING_SLACK); // Note: don't addref "this" as we'll cancel the timer in the // InternetSearchDataSource destructor } diff --git a/mozilla/xpfe/components/updates/src/nsUpdateNotifier.js b/mozilla/xpfe/components/updates/src/nsUpdateNotifier.js index 4794725df34..5d74492acbf 100644 --- a/mozilla/xpfe/components/updates/src/nsUpdateNotifier.js +++ b/mozilla/xpfe/components/updates/src/nsUpdateNotifier.js @@ -80,7 +80,7 @@ var nsUpdateNotifier = const kIScriptableTimer = Components.interfaces.nsIScriptableTimer; mTimer = Components.classes["@mozilla.org/timer;1"]. createInstance(kIScriptableTimer); - mTimer.init(this, kUpdateCheckDelay, kIScriptableTimer.PRIORITY_NORMAL, + mTimer.init(this, kUpdateCheckDelay, true, kIScriptableTimer.TYPE_ONE_SHOT); // we are no longer interested in the ``domwindowopened'' topic