diff --git a/dom/base/nsXMLContentSerializer.h b/dom/base/nsXMLContentSerializer.h index ce2967f1b3ef..941acb1790da 100644 --- a/dom/base/nsXMLContentSerializer.h +++ b/dom/base/nsXMLContentSerializer.h @@ -336,7 +336,7 @@ class nsXMLContentSerializer : public nsIContentSerializer { nsTArray mNameSpaceStack; // nsIDocumentEncoder flags - uint32_t mFlags; + MOZ_INIT_OUTSIDE_CTOR uint32_t mFlags; // characters to use for line break nsString mLineBreak; @@ -348,20 +348,20 @@ class nsXMLContentSerializer : public nsIContentSerializer { uint32_t mColPos; // true = pretty formating should be done (OutputFormated flag) - bool mDoFormat; + MOZ_INIT_OUTSIDE_CTOR bool mDoFormat; // true = no formatting,(OutputRaw flag) // no newline convertion and no rewrap long lines even if OutputWrap is set. - bool mDoRaw; + MOZ_INIT_OUTSIDE_CTOR bool mDoRaw; // true = wrapping should be done (OutputWrap flag) - bool mDoWrap; + MOZ_INIT_OUTSIDE_CTOR bool mDoWrap; // true = we can break lines (OutputDisallowLineBreaking flag) - bool mAllowLineBreaking; + MOZ_INIT_OUTSIDE_CTOR bool mAllowLineBreaking; // number of maximum column in a line, in the wrap mode - uint32_t mMaxColumn; + MOZ_INIT_OUTSIDE_CTOR uint32_t mMaxColumn; // current indent value nsString mIndent; @@ -397,7 +397,7 @@ class nsXMLContentSerializer : public nsIContentSerializer { private: // number of nested elements which have preformated content - int32_t mPreLevel; + MOZ_INIT_OUTSIDE_CTOR int32_t mPreLevel; }; nsresult diff --git a/dom/xul/templates/nsXULSortService.h b/dom/xul/templates/nsXULSortService.h index c003974ead8b..306481e0d4c0 100644 --- a/dom/xul/templates/nsXULSortService.h +++ b/dom/xul/templates/nsXULSortService.h @@ -42,23 +42,24 @@ enum nsSortState_direction { struct nsSortState { bool initialized; - bool invertSort; - bool inbetweenSeparatorSort; - bool sortStaticsLast; - bool isContainerRDFSeq; + MOZ_INIT_OUTSIDE_CTOR bool invertSort; + MOZ_INIT_OUTSIDE_CTOR bool inbetweenSeparatorSort; + MOZ_INIT_OUTSIDE_CTOR bool sortStaticsLast; + MOZ_INIT_OUTSIDE_CTOR bool isContainerRDFSeq; uint32_t sortHints; - nsSortState_direction direction; + MOZ_INIT_OUTSIDE_CTOR nsSortState_direction direction; nsAutoString sort; nsCOMArray sortKeys; nsCOMPtr processor; nsCOMPtr lastContainer; - bool lastWasFirst, lastWasLast; + MOZ_INIT_OUTSIDE_CTOR bool lastWasFirst, lastWasLast; nsSortState() : initialized(false), + isContainerRDFSeq(false), sortHints(0) { }