Bug 416998: Fix the order of member variable initializers for a few constructors. sr=bz, a=schrep

git-svn-id: svn://10.0.0.236/trunk@245954 18797224-902f-48f8-a5cc-f745e15eee43
2008-02-19 07:36:52 +00:00
parent 822749de8e
commit 66730e483a
10 changed files with 18 additions and 18 deletions
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -161,9 +161,9 @@ nsHTMLEditor::nsHTMLEditor()
 , mIsMoving(PR_FALSE)
 , mSnapToGridEnabled(PR_FALSE)
 , mIsInlineTableEditingEnabled(PR_TRUE)
-, mGridSize(0)
 , mInfoXIncrement(20)
 , mInfoYIncrement(20)
+, mGridSize(0)
 {
 } 

--- a/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp
+++ b/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp
@@ -93,7 +93,7 @@ eFontPrefLang GetFontPrefLangFor(PRUint8 aUnicodeRange);
 gfxAtsuiFont::gfxAtsuiFont(MacOSFontEntry *aFontEntry,
                           const gfxFontStyle *fontStyle)
    : gfxFont(aFontEntry->Name(), fontStyle),
-      mFontStyle(fontStyle), mFontEntry(aFontEntry), mATSUStyle(nsnull),
+      mFontStyle(fontStyle), mATSUStyle(nsnull), mFontEntry(aFontEntry),
      mHasMirroring(PR_FALSE), mHasMirroringLookedUp(PR_FALSE), mAdjustedSize(0.0f)
 {
    ATSUFontID fontID = mFontEntry->GetFontID();
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -68,11 +68,11 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
  : mBlock(aFrame),
    mPresContext(aPresContext),
    mReflowState(aReflowState),
+    mOverflowTracker(aPresContext, aFrame, PR_FALSE),
    mPrevBottomMargin(),
    mLineNumber(0),
    mFlags(0),
-    mFloatBreakType(NS_STYLE_CLEAR_NONE),
-    mOverflowTracker(aPresContext, aFrame, PR_FALSE)
+    mFloatBreakType(NS_STYLE_CLEAR_NONE)
 {
  SetFlag(BRS_ISFIRSTINFLOW, aFrame->GetPrevInFlow() == nsnull);
  SetFlag(BRS_ISOVERFLOWCONTAINER,
--- a/mozilla/layout/printing/nsPagePrintTimer.cpp
+++ b/mozilla/layout/printing/nsPagePrintTimer.cpp
@@ -44,8 +44,8 @@ NS_IMPL_ISUPPORTS1(nsPagePrintTimer, nsITimerCallback)

 nsPagePrintTimer::nsPagePrintTimer() :
  mPrintEngine(nsnull),
-  mPrintObj(nsnull),
-  mDelay(0)
+  mDelay(0),
+  mPrintObj(nsnull)
 {
 }

--- a/mozilla/layout/printing/nsPrintEngine.cpp
+++ b/mozilla/layout/printing/nsPrintEngine.cpp
@@ -226,18 +226,18 @@ NS_IMPL_ISUPPORTS1(nsPrintEngine, nsIObserver)
 nsPrintEngine::nsPrintEngine() :
  mIsCreatingPrintPreview(PR_FALSE),
  mIsDoingPrinting(PR_FALSE),
+  mIsDoingPrintPreview(PR_FALSE),
+  mProgressDialogIsShown(PR_FALSE),
  mDocViewerPrint(nsnull),
  mContainer(nsnull),
  mDeviceContext(nsnull),
  mPrt(nsnull),
  mPagePrintTimer(nsnull),
  mPageSeqFrame(nsnull),
-  mIsDoingPrintPreview(PR_FALSE),
  mParentWidget(nsnull),
  mPrtPreview(nsnull),
  mOldPrtPreview(nsnull),
-  mDebugFile(nsnull),
-  mProgressDialogIsShown(PR_FALSE)
+  mDebugFile(nsnull)
 {
 }

--- a/mozilla/layout/style/nsStyleStruct.cpp
+++ b/mozilla/layout/style/nsStyleStruct.cpp
@@ -127,8 +127,8 @@ nsStyleFont::nsStyleFont(const nsStyleFont& aSrc)
 #ifdef MOZ_MATHML
  , mScriptLevel(aSrc.mScriptLevel)
  , mScriptUnconstrainedSize(aSrc.mScriptUnconstrainedSize)
-  , mScriptSizeMultiplier(aSrc.mScriptSizeMultiplier)
  , mScriptMinSize(aSrc.mScriptMinSize)
+  , mScriptSizeMultiplier(aSrc.mScriptSizeMultiplier)
 #endif
 {
 }
--- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -898,8 +898,8 @@ nsMsgDatabase::nsMsgDatabase()
        m_cachedHeaders(nsnull),
        m_bCacheHeaders(PR_TRUE),
        m_cachedThreadId(nsMsgKey_None),
-        m_cacheSize(kMaxHdrsInCache),
-        m_msgReferences(nsnull)
+        m_msgReferences(nsnull),
+        m_cacheSize(kMaxHdrsInCache)
 {
 }

--- a/mozilla/modules/libjar/nsJARInputStream.h
+++ b/mozilla/modules/libjar/nsJARInputStream.h
@@ -53,7 +53,7 @@ class nsJARInputStream : public nsIInputStream
  public:
    nsJARInputStream() : 
        mFd(nsnull), mInSize(0), mCurPos(0),
-        mClosed(PR_FALSE), mInflate(nsnull), mDirectory(0) { }
+        mInflate(nsnull), mDirectory(0), mClosed(PR_FALSE) { }
    
    ~nsJARInputStream() { Close(); }

--- a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -117,9 +117,9 @@ nsGIFDecoder2::nsGIFDecoder2()
  : mCurrentRow(-1)
  , mLastFlushedRow(-1)
  , mImageData(nsnull)
+  , mOldColor(0)
  , mCurrentPass(0)
  , mLastFlushedPass(0)
-  , mOldColor(0)
  , mGIFOpen(PR_FALSE)
  , mSawTransparency(PR_FALSE)
 {
--- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
+++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
@@ -400,8 +400,8 @@ nsDownloadManager::AssertProgressInfoFor(const nsACString& aTargetPath)
                                 internalDownload->GetTransferInformation();

  // convert from bytes to kbytes for progress display
-  PRInt64 current = (PRFloat64)transferInfo.mCurrBytes / 1024 + .5;
-  PRInt64 max = (PRFloat64)transferInfo.mMaxBytes / 1024 + .5;
+  PRInt64 current = (transferInfo.mCurrBytes + 512) / 1024;
+  PRInt64 max = (transferInfo.mMaxBytes + 512) / 1024;

  nsAutoString currBytes; currBytes.AppendInt(current);
  nsAutoString maxBytes; maxBytes.AppendInt(max);
@@ -906,8 +906,8 @@ nsDownload::nsDownload(nsDownloadManager* aManager,
                         mCurrBytes(LL_ZERO),
                         mMaxBytes(LL_ZERO),
                         mStartTime(LL_ZERO),
-                         mSpeed(0),
-                         mLastUpdate(PR_Now() - (PRUint32)gInterval)
+                         mLastUpdate(PR_Now() - (PRUint32)gInterval),
+                         mSpeed(0)
 {
 }