From e92c7a31680f0eb3df024cc8017e009d82d3d6eb Mon Sep 17 00:00:00 2001 From: "kmcclusk%netscape.com" Date: Tue, 21 Mar 2000 21:47:50 +0000 Subject: [PATCH] Initialize the result value in nsViewManager::SetFrameRate b=32381 r=rods@netscape.com git-svn-id: svn://10.0.0.236/trunk@63620 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/view/src/nsViewManager.cpp | 6 +----- mozilla/view/src/nsViewManager2.cpp | 20 +++++++++----------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp index d4c20018b90..d7328ca993d 100644 --- a/mozilla/view/src/nsViewManager.cpp +++ b/mozilla/view/src/nsViewManager.cpp @@ -347,7 +347,7 @@ NS_IMETHODIMP nsViewManager :: GetFrameRate(PRUint32 &aRate) NS_IMETHODIMP nsViewManager :: SetFrameRate(PRUint32 aFrameRate) { - nsresult rv; + nsresult rv = NS_OK; if (aFrameRate != mFrameRate) { @@ -372,11 +372,7 @@ NS_IMETHODIMP nsViewManager :: SetFrameRate(PRUint32 aFrameRate) mTimer->Init(vm_timer_callback, this, 1000 / mFrameRate); #endif } - else - rv = NS_OK; } - else - rv = NS_OK; return rv; } diff --git a/mozilla/view/src/nsViewManager2.cpp b/mozilla/view/src/nsViewManager2.cpp index f70f77d99d8..c640a29e84a 100755 --- a/mozilla/view/src/nsViewManager2.cpp +++ b/mozilla/view/src/nsViewManager2.cpp @@ -347,35 +347,33 @@ NS_IMETHODIMP nsViewManager2::GetFrameRate(PRUint32 &aRate) NS_IMETHODIMP nsViewManager2::SetFrameRate(PRUint32 aFrameRate) { - nsresult rv; + nsresult rv = NS_OK; if (aFrameRate != mFrameRate) - { + { #ifdef NS_VIEWMANAGER_NEEDS_TIMER if (nsnull != mTimer) - { + { mTimer->Cancel(); //XXX this should not be necessary. MMP NS_RELEASE(mTimer); - } + } #endif mFrameRate = aFrameRate; mTrueFrameRate = aFrameRate; if (mFrameRate != 0) - { + { #ifdef NS_VIEWMANAGER_NEEDS_TIMER rv = NS_NewTimer(&mTimer); if (NS_OK == rv) mTimer->Init(vm_timer_callback, this, 1000 / mFrameRate); #endif - } - else - rv = NS_OK; - } - else - rv = NS_OK; + } + + } + return rv; }