mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

#78728 

r=pierre, sr=waterson
Change bool/true/false cases to PRBool/PR_TRUE/PR_FALSE
This commit is contained in:
mkaply%us.ibm.com 2001-05-08 14:19:01 +00:00
Родитель e48bb6adcf
Коммит e365bb5bdf
4 изменённых файлов: 50 добавлений и 50 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
content/base/src/nsStyleContext.cpp
Просмотреть файл

@ -2869,13 +2869,13 @@ const nsStyleStruct* StyleContextImpl::GetStyleData(nsStyleStructID aSID)
NS_PRECONDITION(aSID > 0 && aSID <= eStyleStruct_Max, "Invalid style struct id");
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, true);
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, PR_TRUE);
#endif
const nsStyleStruct* result = FetchInheritedStyleStruct(aSID);
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, false);
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, PR_FALSE);
#endif
return result;
@ -2988,7 +2988,7 @@ static void ReleaseMutableStyleStruct(nsStyleStructID aSID, nsStyleStruct* aSty
return;
}
}
NS_ASSERTION(false, "Can't release mutable style struct");
NS_ASSERTION(PR_FALSE, "Can't release mutable style struct");
}
@ -3002,10 +3002,10 @@ void StyleContextImpl::ReadMutableStyleData(nsStyleStructID aSID, nsStyleStruct*
NS_PRECONDITION(aSID > 0 && aSID <= eStyleStruct_Max, "Invalid style struct id");
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, true);
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, PR_TRUE);
#endif
#ifdef LOG_STYLE_STRUCTS
mStyleData->mGotMutable[aSID] = true;
mStyleData->mGotMutable[aSID] = PR_TRUE;
#endif
nsStyleStruct* result = GetNewMutableStyleStruct(aSID);
@ -3021,7 +3021,7 @@ void StyleContextImpl::ReadMutableStyleData(nsStyleStructID aSID, nsStyleStruct*
#endif
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, false);
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, PR_FALSE);
#endif
*aStyleStructPtr = result;
@ -3066,7 +3066,7 @@ nsresult StyleContextImpl::WriteMutableStyleData(nsStyleStructID aSID, nsStyleSt
NS_PRECONDITION(aSID > 0 && aSID <= eStyleStruct_Max, "Invalid style struct id");
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, true);
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, PR_TRUE);
#endif
#ifdef LOG_WRITE_STYLE_DATA_CALLS
LogWriteMutableStyleDataCall(aSID, aStyleStruct, this);
@ -3076,7 +3076,7 @@ nsresult StyleContextImpl::WriteMutableStyleData(nsStyleStructID aSID, nsStyleSt
ReleaseMutableStyleStruct(aSID, aStyleStruct);
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, false);
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, PR_FALSE);
#endif
return NS_OK;
}
@ -3106,7 +3106,7 @@ NS_IMETHODIMP
StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
{
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, true);
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, PR_TRUE);
#endif
if (aSID == eStyleStruct_BorderPaddingShortcut) {
@ -3133,7 +3133,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
}
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, false);
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, PR_FALSE);
#endif
return NS_OK;
}

28
content/base/src/nsStyleContextDebug.cpp
Просмотреть файл

@ -31,7 +31,7 @@
#ifdef XP_MAC
#include <Events.h>
#include <Timer.h>
static bool MacKeyDown(unsigned char theKey)
static PRBool MacKeyDown(unsigned char theKey)
{
KeyMap map;
GetKeys(map);
@ -40,15 +40,15 @@ static bool MacKeyDown(unsigned char theKey)
#endif
static bool IsTimeToDumpDebugData()
static PRBool IsTimeToDumpDebugData()
{
bool timeToDump = false;
PRBool timeToDump = PR_FALSE;
#ifdef XP_MAC
static unsigned long lastTicks = 0;
if (MacKeyDown(0x3b)) { // control key
if ((unsigned long)(::TickCount() - lastTicks) > 60) {
lastTicks = ::TickCount();
timeToDump = true;
timeToDump = PR_TRUE;
}
}
#endif
@ -72,10 +72,10 @@ static void LogStyleStructs(nsStyleContextData* aStyleContextData)
static unsigned long gotMutable[max_structs];
static unsigned long gotMutableAndDefault[max_structs];
static bool resetCounters = true;
static PRBool resetCounters = PR_TRUE;
if (IsTimeToDumpDebugData()) {
resetCounters = true;
resetCounters = PR_TRUE;
printf("\n\n\n");
printf("-------------------------------------------------------------------------------------------------------------\n");
printf("Count of nsStyleContextData: %ld\n", totalCount);
@ -134,7 +134,7 @@ static void LogStyleStructs(nsStyleContextData* aStyleContextData)
}
if (resetCounters) {
resetCounters = false;
resetCounters = PR_FALSE;
totalCount = 0;
for (short i = 0; i < max_structs; i ++) {
defaultStruct[i] = 0L;
@ -344,7 +344,7 @@ static void LogStyleStructs(nsStyleContextData* aStyleContextData)
#ifdef LOG_GET_STYLE_DATA_CALLS
static void LogGetStyleDataCall(nsStyleStructID aSID, LogCallType aLogCallType, nsIStyleContext* aStyleContext, bool aEnteringFunction)
static void LogGetStyleDataCall(nsStyleStructID aSID, LogCallType aLogCallType, nsIStyleContext* aStyleContext, PRBool aEnteringFunction)
{
#define max_structs (eStyleStruct_Max + 1)
#define small_depth_threshold 8
@ -367,10 +367,10 @@ static void LogGetStyleDataCall(nsStyleStructID aSID, LogCallType aLogCallType,
}
static bool resetCounters = true;
static PRBool resetCounters = PR_TRUE;
if (IsTimeToDumpDebugData()) {
resetCounters = true;
resetCounters = PR_TRUE;
unsigned long totalCalls;
unsigned long totalMaxdepth;
@ -452,7 +452,7 @@ static void LogGetStyleDataCall(nsStyleStructID aSID, LogCallType aLogCallType,
}
if (resetCounters) {
resetCounters = false;
resetCounters = PR_FALSE;
totalMicrosecs = 0;
for (short i = 0; i < logCallType_Max; i ++) {
microsecs[i] = 0L;
@ -513,9 +513,9 @@ static void LogWriteMutableStyleDataCall(nsStyleStructID aSID, nsStyleStruct* aS
static unsigned long calls[max_structs];
static unsigned long unchanged[max_structs];
static bool resetCounters = true;
static PRBool resetCounters = PR_TRUE;
if (IsTimeToDumpDebugData()) {
resetCounters = true;
resetCounters = PR_TRUE;
printf("------------------------------------------------------------------------------------------\n");
printf("WriteMutableStyleData\n");
@ -554,7 +554,7 @@ static void LogWriteMutableStyleDataCall(nsStyleStructID aSID, nsStyleStruct* aS
}
if (resetCounters) {
resetCounters = false;
resetCounters = PR_FALSE;
for (short i=0; i<max_structs; i++) {
calls[i] = 0;
unchanged[i] = 0;

32
content/base/src/nsStyleContextDebug.h
Просмотреть файл

@ -36,7 +36,7 @@ struct StyleFontImplLog: public StyleFontImpl {
{}
void ResetFrom(const nsStyleFont* aParent, nsIPresContext* aPresContext);
StyleFontImpl mInternalFont;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleFontImplLog::ResetFrom(const nsStyleFont* aParent, nsIPresContext* aPresContext)
@ -50,7 +50,7 @@ void StyleFontImplLog::ResetFrom(const nsStyleFont* aParent, nsIPresContext* aPr
struct StyleColorImplLog: public StyleColorImpl {
void ResetFrom(const nsStyleColor* aParent, nsIPresContext* aPresContext);
StyleColorImpl mInternalColor;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleColorImplLog::ResetFrom(const nsStyleColor* aParent, nsIPresContext* aPresContext)
@ -64,7 +64,7 @@ void StyleColorImplLog::ResetFrom(const nsStyleColor* aParent, nsIPresContext* a
struct StyleListImplLog: public StyleListImpl {
void ResetFrom(const nsStyleList* aParent, nsIPresContext* aPresContext);
StyleListImpl mInternalList;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleListImplLog::ResetFrom(const nsStyleList* aParent, nsIPresContext* aPresContext)
@ -78,7 +78,7 @@ void StyleListImplLog::ResetFrom(const nsStyleList* aParent, nsIPresContext* aPr
struct StylePositionImplLog: public StylePositionImpl {
void ResetFrom(const nsStylePosition* aParent, nsIPresContext* aPresContext);
StylePositionImpl mInternalPosition;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StylePositionImplLog::ResetFrom(const nsStylePosition* aParent, nsIPresContext* aPresContext)
@ -92,7 +92,7 @@ void StylePositionImplLog::ResetFrom(const nsStylePosition* aParent, nsIPresCont
struct StyleTextImplLog: public StyleTextImpl {
void ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresContext);
StyleTextImpl mInternalText;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleTextImplLog::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresContext)
@ -106,7 +106,7 @@ void StyleTextImplLog::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPr
struct StyleDisplayImplLog: public StyleDisplayImpl {
void ResetFrom(const nsStyleDisplay* aParent, nsIPresContext* aPresContext);
StyleDisplayImpl mInternalDisplay;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleDisplayImplLog::ResetFrom(const nsStyleDisplay* aParent, nsIPresContext* aPresContext)
@ -120,7 +120,7 @@ void StyleDisplayImplLog::ResetFrom(const nsStyleDisplay* aParent, nsIPresContex
struct StyleTableImplLog: public StyleTableImpl {
void ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPresContext);
StyleTableImpl mInternalTable;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleTableImplLog::ResetFrom(const nsStyleTable* aParent, nsIPresContext* aPresContext)
@ -134,7 +134,7 @@ void StyleTableImplLog::ResetFrom(const nsStyleTable* aParent, nsIPresContext* a
struct StyleContentImplLog: public StyleContentImpl {
void ResetFrom(const StyleContentImpl* aParent, nsIPresContext* aPresContext);
StyleContentImpl mInternalContent;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleContentImplLog::ResetFrom(const StyleContentImpl* aParent, nsIPresContext* aPresContext)
@ -148,7 +148,7 @@ void StyleContentImplLog::ResetFrom(const StyleContentImpl* aParent, nsIPresCont
struct StyleUserInterfaceImplLog: public StyleUserInterfaceImpl {
void ResetFrom(const nsStyleUserInterface* aParent, nsIPresContext* aPresContext);
StyleUserInterfaceImpl mInternalUserInterface;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleUserInterfaceImplLog::ResetFrom(const nsStyleUserInterface* aParent, nsIPresContext* aPresContext)
@ -162,7 +162,7 @@ void StyleUserInterfaceImplLog::ResetFrom(const nsStyleUserInterface* aParent, n
struct StylePrintImplLog: public StylePrintImpl {
void ResetFrom(const nsStylePrint* aParent, nsIPresContext* aPresContext);
StylePrintImpl mInternalPrint;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StylePrintImplLog::ResetFrom(const nsStylePrint* aParent, nsIPresContext* aPresContext)
@ -176,7 +176,7 @@ void StylePrintImplLog::ResetFrom(const nsStylePrint* aParent, nsIPresContext* a
struct StyleMarginImplLog: public StyleMarginImpl {
void ResetFrom(const nsStyleMargin* aParent, nsIPresContext* aPresContext);
StyleMarginImpl mInternalMargin;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleMarginImplLog::ResetFrom(const nsStyleMargin* aParent, nsIPresContext* aPresContext)
@ -190,7 +190,7 @@ void StyleMarginImplLog::ResetFrom(const nsStyleMargin* aParent, nsIPresContext*
struct StylePaddingImplLog: public StylePaddingImpl {
void ResetFrom(const nsStylePadding* aParent, nsIPresContext* aPresContext);
StylePaddingImpl mInternalPadding;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StylePaddingImplLog::ResetFrom(const nsStylePadding* aParent, nsIPresContext* aPresContext)
@ -204,7 +204,7 @@ void StylePaddingImplLog::ResetFrom(const nsStylePadding* aParent, nsIPresContex
struct StyleBorderImplLog: public StyleBorderImpl {
void ResetFrom(const nsStyleBorder* aParent, nsIPresContext* aPresContext);
StyleBorderImpl mInternalBorder;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleBorderImplLog::ResetFrom(const nsStyleBorder* aParent, nsIPresContext* aPresContext)
@ -218,7 +218,7 @@ void StyleBorderImplLog::ResetFrom(const nsStyleBorder* aParent, nsIPresContext*
struct StyleOutlineImplLog: public StyleOutlineImpl {
void ResetFrom(const nsStyleOutline* aParent, nsIPresContext* aPresContext);
StyleOutlineImpl mInternalOutline;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleOutlineImplLog::ResetFrom(const nsStyleOutline* aParent, nsIPresContext* aPresContext)
@ -233,7 +233,7 @@ void StyleOutlineImplLog::ResetFrom(const nsStyleOutline* aParent, nsIPresContex
struct StyleXULImplLog: public StyleXULImpl {
void ResetFrom(const nsStyleXUL* aParent, nsIPresContext* aPresContext);
StyleXULImpl mInternalXUL;
bool mSetFromParent;
PRBool mSetFromParent;
};
void StyleXULImplLog::ResetFrom(const nsStyleXUL* aParent, nsIPresContext* aPresContext)
@ -268,7 +268,7 @@ enum LogCallType {
};
static void LogGetStyleDataCall(nsStyleStructID aSID, LogCallType aLogCallType,
nsIStyleContext* aStyleContext, bool aEnteringFunction);
nsIStyleContext* aStyleContext, PRBool aEnteringFunction);
#endif // LOG_GET_STYLE_DATA_CALLS

20
layout/style/nsStyleContext.cpp
Просмотреть файл

@ -2869,13 +2869,13 @@ const nsStyleStruct* StyleContextImpl::GetStyleData(nsStyleStructID aSID)
NS_PRECONDITION(aSID > 0 && aSID <= eStyleStruct_Max, "Invalid style struct id");
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, true);
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, PR_TRUE);
#endif
const nsStyleStruct* result = FetchInheritedStyleStruct(aSID);
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, false);
LogGetStyleDataCall(aSID, logCallType_GetStyleData, this, PR_FALSE);
#endif
return result;
@ -2988,7 +2988,7 @@ static void ReleaseMutableStyleStruct(nsStyleStructID aSID, nsStyleStruct* aSty
return;
}
}
NS_ASSERTION(false, "Can't release mutable style struct");
NS_ASSERTION(PR_FALSE, "Can't release mutable style struct");
}
@ -3002,10 +3002,10 @@ void StyleContextImpl::ReadMutableStyleData(nsStyleStructID aSID, nsStyleStruct*
NS_PRECONDITION(aSID > 0 && aSID <= eStyleStruct_Max, "Invalid style struct id");
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, true);
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, PR_TRUE);
#endif
#ifdef LOG_STYLE_STRUCTS
mStyleData->mGotMutable[aSID] = true;
mStyleData->mGotMutable[aSID] = PR_TRUE;
#endif
nsStyleStruct* result = GetNewMutableStyleStruct(aSID);
@ -3021,7 +3021,7 @@ void StyleContextImpl::ReadMutableStyleData(nsStyleStructID aSID, nsStyleStruct*
#endif
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, false);
LogGetStyleDataCall(aSID, logCallType_ReadMutableStyleData, this, PR_FALSE);
#endif
*aStyleStructPtr = result;
@ -3066,7 +3066,7 @@ nsresult StyleContextImpl::WriteMutableStyleData(nsStyleStructID aSID, nsStyleSt
NS_PRECONDITION(aSID > 0 && aSID <= eStyleStruct_Max, "Invalid style struct id");
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, true);
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, PR_TRUE);
#endif
#ifdef LOG_WRITE_STYLE_DATA_CALLS
LogWriteMutableStyleDataCall(aSID, aStyleStruct, this);
@ -3076,7 +3076,7 @@ nsresult StyleContextImpl::WriteMutableStyleData(nsStyleStructID aSID, nsStyleSt
ReleaseMutableStyleStruct(aSID, aStyleStruct);
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, false);
LogGetStyleDataCall(aSID, logCallType_WriteMutableStyleData, this, PR_FALSE);
#endif
return NS_OK;
}
@ -3106,7 +3106,7 @@ NS_IMETHODIMP
StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
{
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, true);
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, PR_TRUE);
#endif
if (aSID == eStyleStruct_BorderPaddingShortcut) {
@ -3133,7 +3133,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
}
#ifdef LOG_GET_STYLE_DATA_CALLS
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, false);
LogGetStyleDataCall(aSID, logCallType_GetStyle, (nsIStyleContext*)this, PR_FALSE);
#endif
return NS_OK;
}