зеркало из https://github.com/mozilla/gecko-dev.git
Bug 124870. PRBool -> PRPackedBool in lots of places. Patch by
dann@godzilla.ics.uci.edu, r=heikki, sr=jst
This commit is contained in:
Родитель
0a66989320
Коммит
2b05ed9368
|
@ -384,11 +384,11 @@ class CAttributeToken: public CHTMLToken {
|
|||
|
||||
PRPackedBool mHasEqualWithoutValue;
|
||||
protected:
|
||||
nsAutoString mTextValue;
|
||||
nsSlidingSubstring mTextKey;
|
||||
#ifdef DEBUG
|
||||
PRPackedBool mLastAttribute;
|
||||
#endif
|
||||
nsAutoString mTextValue;
|
||||
nsSlidingSubstring mTextKey;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -166,19 +166,20 @@ protected:
|
|||
nsIHTMLContentSink* mSink;
|
||||
|
||||
nsDTDContext* mBodyContext;
|
||||
PRBool mHasOpenForm;
|
||||
PRBool mHasOpenMap;
|
||||
PRInt32 mHasOpenHead;
|
||||
PRBool mHasOpenBody;
|
||||
PRBool mHadFrameset;
|
||||
PRBool mHadBody;
|
||||
PRPackedBool mHasOpenForm;
|
||||
PRPackedBool mHasOpenMap;
|
||||
PRPackedBool mHasOpenBody;
|
||||
PRPackedBool mHadFrameset;
|
||||
PRPackedBool mHadBody;
|
||||
PRPackedBool mHasOpenScript;
|
||||
PRPackedBool mEnableStrict;
|
||||
nsString mFilename;
|
||||
PRInt32 mLineNumber;
|
||||
nsParser* mParser;
|
||||
nsITokenizer* mTokenizer; // weak
|
||||
nsTokenAllocator* mTokenAllocator;
|
||||
nsNodeAllocator* mNodeAllocator;
|
||||
PRBool mHasOpenScript;
|
||||
eHTMLTags mSkipTarget;
|
||||
nsresult mDTDState;
|
||||
nsDTDMode mDTDMode;
|
||||
|
@ -188,7 +189,6 @@ protected:
|
|||
PRUint32 mExpectedCRC32;
|
||||
nsString mScratch; //used for various purposes; non-persistent
|
||||
eParserDocType mDocType;
|
||||
PRBool mEnableStrict;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -99,8 +99,8 @@ public:
|
|||
eAutoDetectResult mAutoDetectStatus;
|
||||
eParserCommands mParserCommand; //tells us to viewcontent/viewsource/viewerrors...
|
||||
|
||||
PRBool mMultipart;
|
||||
PRBool mCopyUnused;
|
||||
PRPackedBool mMultipart;
|
||||
PRPackedBool mCopyUnused;
|
||||
PRUint32 mTransferBufferSize;
|
||||
};
|
||||
|
||||
|
|
|
@ -222,12 +222,12 @@ public:
|
|||
return result;
|
||||
}
|
||||
|
||||
PRBool mHasCaption;
|
||||
PRBool mHasCols;
|
||||
PRBool mHasTHead;
|
||||
PRBool mHasTFoot;
|
||||
PRBool mHasTBody;
|
||||
CTableState *mPrevious;
|
||||
PRPackedBool mHasCaption;
|
||||
PRPackedBool mHasCols;
|
||||
PRPackedBool mHasTHead;
|
||||
PRPackedBool mHasTFoot;
|
||||
PRPackedBool mHasTBody;
|
||||
CTableState *mPrevious;
|
||||
};
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
|
@ -100,10 +100,10 @@ protected:
|
|||
|
||||
nsDeque mTokenDeque;
|
||||
PRInt32 mFlags;
|
||||
PRBool mRecordTrailingContent;
|
||||
PRPackedBool mRecordTrailingContent;
|
||||
PRPackedBool mIsFinalChunk;
|
||||
nsTokenAllocator* mTokenAllocator;
|
||||
PRInt32 mTokenScanPos;
|
||||
PRBool mIsFinalChunk;
|
||||
};
|
||||
|
||||
extern nsresult NS_NewHTMLTokenizer( nsITokenizer** aInstancePtrResult,
|
||||
|
|
|
@ -391,8 +391,8 @@ class nsScanner {
|
|||
PRUint32 mCountRemaining; // The number of bytes still to be read
|
||||
// from the scanner buffer
|
||||
PRUint32 mTotalRead;
|
||||
PRBool mOwnsStream;
|
||||
PRBool mIncremental;
|
||||
PRPackedBool mOwnsStream;
|
||||
PRPackedBool mIncremental;
|
||||
PRInt32 mCharsetSource;
|
||||
nsString mCharset;
|
||||
nsIUnicodeDecoder *mUnicodeDecoder;
|
||||
|
|
|
@ -99,8 +99,6 @@ Stopwatch vsTimer;
|
|||
|
||||
static NS_DEFINE_IID(kClassIID, NS_VIEWSOURCE_HTML_IID);
|
||||
|
||||
static int gErrorThreshold = 10;
|
||||
|
||||
// Define this to dump the viewsource stuff to a file
|
||||
//#define DUMP_TO_FILE
|
||||
#ifdef DUMP_TO_FILE
|
||||
|
@ -350,8 +348,13 @@ CViewSourceHTML::CViewSourceHTML() : mFilename(), mTags(), mErrors() {
|
|||
mWrapLongLines = PR_FALSE;
|
||||
nsCOMPtr<nsIPref> thePrefsService(do_GetService(NS_PREF_CONTRACTID));
|
||||
if (thePrefsService) {
|
||||
thePrefsService->GetBoolPref("view_source.syntax_highlight", &mSyntaxHighlight);
|
||||
thePrefsService->GetBoolPref("view_source.wrap_long_lines", &mWrapLongLines);
|
||||
PRBool temp;
|
||||
nsresult rv;
|
||||
rv = thePrefsService->GetBoolPref("view_source.syntax_highlight", &temp);
|
||||
mSyntaxHighlight = NS_SUCCEEDED(rv) ? temp : PR_TRUE;
|
||||
|
||||
rv = thePrefsService->GetBoolPref("view_source.wrap_long_lines", &temp);
|
||||
mWrapLongLines = NS_SUCCEEDED(rv) ? temp : PR_FALSE;
|
||||
}
|
||||
|
||||
mParser=0;
|
||||
|
|
|
@ -97,8 +97,10 @@ protected:
|
|||
PRInt32 mValue;
|
||||
PRInt32 mPopupTag;
|
||||
PRInt32 mSummaryTag;
|
||||
PRBool mSyntaxHighlight;
|
||||
PRBool mWrapLongLines;
|
||||
PRPackedBool mSyntaxHighlight;
|
||||
PRPackedBool mWrapLongLines;
|
||||
PRPackedBool mHasOpenRoot;
|
||||
PRPackedBool mHasOpenBody;
|
||||
|
||||
nsDTDMode mDTDMode;
|
||||
eParserCommands mParserCommand; //tells us to viewcontent/viewsource/viewerrors...
|
||||
|
@ -110,8 +112,6 @@ protected:
|
|||
nsString mFilename;
|
||||
nsString mTags;
|
||||
nsString mErrors;
|
||||
PRPackedBool mHasOpenRoot;
|
||||
PRPackedBool mHasOpenBody;
|
||||
|
||||
PRUint32 mTokenCount;
|
||||
};
|
||||
|
|
|
@ -113,8 +113,8 @@ public:
|
|||
|
||||
private:
|
||||
PRFileDesc * _fd;
|
||||
PRBool _opened;
|
||||
PRBool _allocated;
|
||||
PRPackedBool _opened;
|
||||
PRPackedBool _allocated;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -384,11 +384,11 @@ class CAttributeToken: public CHTMLToken {
|
|||
|
||||
PRPackedBool mHasEqualWithoutValue;
|
||||
protected:
|
||||
nsAutoString mTextValue;
|
||||
nsSlidingSubstring mTextKey;
|
||||
#ifdef DEBUG
|
||||
PRPackedBool mLastAttribute;
|
||||
#endif
|
||||
nsAutoString mTextValue;
|
||||
nsSlidingSubstring mTextKey;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -166,19 +166,20 @@ protected:
|
|||
nsIHTMLContentSink* mSink;
|
||||
|
||||
nsDTDContext* mBodyContext;
|
||||
PRBool mHasOpenForm;
|
||||
PRBool mHasOpenMap;
|
||||
PRInt32 mHasOpenHead;
|
||||
PRBool mHasOpenBody;
|
||||
PRBool mHadFrameset;
|
||||
PRBool mHadBody;
|
||||
PRPackedBool mHasOpenForm;
|
||||
PRPackedBool mHasOpenMap;
|
||||
PRPackedBool mHasOpenBody;
|
||||
PRPackedBool mHadFrameset;
|
||||
PRPackedBool mHadBody;
|
||||
PRPackedBool mHasOpenScript;
|
||||
PRPackedBool mEnableStrict;
|
||||
nsString mFilename;
|
||||
PRInt32 mLineNumber;
|
||||
nsParser* mParser;
|
||||
nsITokenizer* mTokenizer; // weak
|
||||
nsTokenAllocator* mTokenAllocator;
|
||||
nsNodeAllocator* mNodeAllocator;
|
||||
PRBool mHasOpenScript;
|
||||
eHTMLTags mSkipTarget;
|
||||
nsresult mDTDState;
|
||||
nsDTDMode mDTDMode;
|
||||
|
@ -188,7 +189,6 @@ protected:
|
|||
PRUint32 mExpectedCRC32;
|
||||
nsString mScratch; //used for various purposes; non-persistent
|
||||
eParserDocType mDocType;
|
||||
PRBool mEnableStrict;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -99,8 +99,8 @@ public:
|
|||
eAutoDetectResult mAutoDetectStatus;
|
||||
eParserCommands mParserCommand; //tells us to viewcontent/viewsource/viewerrors...
|
||||
|
||||
PRBool mMultipart;
|
||||
PRBool mCopyUnused;
|
||||
PRPackedBool mMultipart;
|
||||
PRPackedBool mCopyUnused;
|
||||
PRUint32 mTransferBufferSize;
|
||||
};
|
||||
|
||||
|
|
|
@ -222,12 +222,12 @@ public:
|
|||
return result;
|
||||
}
|
||||
|
||||
PRBool mHasCaption;
|
||||
PRBool mHasCols;
|
||||
PRBool mHasTHead;
|
||||
PRBool mHasTFoot;
|
||||
PRBool mHasTBody;
|
||||
CTableState *mPrevious;
|
||||
PRPackedBool mHasCaption;
|
||||
PRPackedBool mHasCols;
|
||||
PRPackedBool mHasTHead;
|
||||
PRPackedBool mHasTFoot;
|
||||
PRPackedBool mHasTBody;
|
||||
CTableState *mPrevious;
|
||||
};
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
|
@ -100,10 +100,10 @@ protected:
|
|||
|
||||
nsDeque mTokenDeque;
|
||||
PRInt32 mFlags;
|
||||
PRBool mRecordTrailingContent;
|
||||
PRPackedBool mRecordTrailingContent;
|
||||
PRPackedBool mIsFinalChunk;
|
||||
nsTokenAllocator* mTokenAllocator;
|
||||
PRInt32 mTokenScanPos;
|
||||
PRBool mIsFinalChunk;
|
||||
};
|
||||
|
||||
extern nsresult NS_NewHTMLTokenizer( nsITokenizer** aInstancePtrResult,
|
||||
|
|
|
@ -391,8 +391,8 @@ class nsScanner {
|
|||
PRUint32 mCountRemaining; // The number of bytes still to be read
|
||||
// from the scanner buffer
|
||||
PRUint32 mTotalRead;
|
||||
PRBool mOwnsStream;
|
||||
PRBool mIncremental;
|
||||
PRPackedBool mOwnsStream;
|
||||
PRPackedBool mIncremental;
|
||||
PRInt32 mCharsetSource;
|
||||
nsString mCharset;
|
||||
nsIUnicodeDecoder *mUnicodeDecoder;
|
||||
|
|
|
@ -99,8 +99,6 @@ Stopwatch vsTimer;
|
|||
|
||||
static NS_DEFINE_IID(kClassIID, NS_VIEWSOURCE_HTML_IID);
|
||||
|
||||
static int gErrorThreshold = 10;
|
||||
|
||||
// Define this to dump the viewsource stuff to a file
|
||||
//#define DUMP_TO_FILE
|
||||
#ifdef DUMP_TO_FILE
|
||||
|
@ -350,8 +348,13 @@ CViewSourceHTML::CViewSourceHTML() : mFilename(), mTags(), mErrors() {
|
|||
mWrapLongLines = PR_FALSE;
|
||||
nsCOMPtr<nsIPref> thePrefsService(do_GetService(NS_PREF_CONTRACTID));
|
||||
if (thePrefsService) {
|
||||
thePrefsService->GetBoolPref("view_source.syntax_highlight", &mSyntaxHighlight);
|
||||
thePrefsService->GetBoolPref("view_source.wrap_long_lines", &mWrapLongLines);
|
||||
PRBool temp;
|
||||
nsresult rv;
|
||||
rv = thePrefsService->GetBoolPref("view_source.syntax_highlight", &temp);
|
||||
mSyntaxHighlight = NS_SUCCEEDED(rv) ? temp : PR_TRUE;
|
||||
|
||||
rv = thePrefsService->GetBoolPref("view_source.wrap_long_lines", &temp);
|
||||
mWrapLongLines = NS_SUCCEEDED(rv) ? temp : PR_FALSE;
|
||||
}
|
||||
|
||||
mParser=0;
|
||||
|
|
|
@ -97,8 +97,10 @@ protected:
|
|||
PRInt32 mValue;
|
||||
PRInt32 mPopupTag;
|
||||
PRInt32 mSummaryTag;
|
||||
PRBool mSyntaxHighlight;
|
||||
PRBool mWrapLongLines;
|
||||
PRPackedBool mSyntaxHighlight;
|
||||
PRPackedBool mWrapLongLines;
|
||||
PRPackedBool mHasOpenRoot;
|
||||
PRPackedBool mHasOpenBody;
|
||||
|
||||
nsDTDMode mDTDMode;
|
||||
eParserCommands mParserCommand; //tells us to viewcontent/viewsource/viewerrors...
|
||||
|
@ -110,8 +112,6 @@ protected:
|
|||
nsString mFilename;
|
||||
nsString mTags;
|
||||
nsString mErrors;
|
||||
PRPackedBool mHasOpenRoot;
|
||||
PRPackedBool mHasOpenBody;
|
||||
|
||||
PRUint32 mTokenCount;
|
||||
};
|
||||
|
|
|
@ -113,8 +113,8 @@ public:
|
|||
|
||||
private:
|
||||
PRFileDesc * _fd;
|
||||
PRBool _opened;
|
||||
PRBool _allocated;
|
||||
PRPackedBool _opened;
|
||||
PRPackedBool _allocated;
|
||||
};
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче