Bug 1282408 - add ignore flag for variables from nsSortState & nsXMLContentSerializer. r=bzbarsky

This commit is contained in:
Paul Bignier 2016-07-27 14:41:55 +02:00
parent c9501b6a52
commit a0285e5e8e
2 changed files with 14 additions and 13 deletions

View File

@ -336,7 +336,7 @@ class nsXMLContentSerializer : public nsIContentSerializer {
nsTArray<NameSpaceDecl> 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

View File

@ -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<nsIAtom> sortKeys;
nsCOMPtr<nsIXULTemplateQueryProcessor> processor;
nsCOMPtr<nsIContent> lastContainer;
bool lastWasFirst, lastWasLast;
MOZ_INIT_OUTSIDE_CTOR bool lastWasFirst, lastWasLast;
nsSortState()
: initialized(false),
isContainerRDFSeq(false),
sortHints(0)
{
}