зеркало из https://github.com/mozilla/gecko-dev.git
Bug 918176 - Silence uninitialized variable warning in nsRuleNode::ComputeContentData. r=dholbert
This commit is contained in:
Родитель
2e5a35bd02
Коммит
98cdad98f5
|
@ -1639,6 +1639,10 @@ nsCSSFrameConstructor::CreateGeneratedContent(nsFrameConstructorState& aState,
|
|||
|
||||
break;
|
||||
}
|
||||
|
||||
case eStyleContentType_Uninitialized:
|
||||
NS_NOTREACHED("uninitialized content type");
|
||||
return nullptr;
|
||||
} // switch
|
||||
|
||||
return nullptr;
|
||||
|
|
|
@ -6994,10 +6994,11 @@ nsRuleNode::ComputeContentData(void* aStartStruct,
|
|||
type = eStyleContentType_NoCloseQuote; break;
|
||||
default:
|
||||
NS_ERROR("bad content value");
|
||||
type = eStyleContentType_Uninitialized; break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
NS_ERROR("bad content type");
|
||||
type = eStyleContentType_Uninitialized;
|
||||
}
|
||||
data.mType = type;
|
||||
if (type == eStyleContentType_Image) {
|
||||
|
|
|
@ -1887,7 +1887,8 @@ enum nsStyleContentType {
|
|||
eStyleContentType_CloseQuote = 41,
|
||||
eStyleContentType_NoOpenQuote = 42,
|
||||
eStyleContentType_NoCloseQuote = 43,
|
||||
eStyleContentType_AltContent = 50
|
||||
eStyleContentType_AltContent = 50,
|
||||
eStyleContentType_Uninitialized
|
||||
};
|
||||
|
||||
struct nsStyleContentData {
|
||||
|
@ -1902,7 +1903,7 @@ struct nsStyleContentData {
|
|||
#endif
|
||||
|
||||
nsStyleContentData()
|
||||
: mType(nsStyleContentType(0))
|
||||
: mType(eStyleContentType_Uninitialized)
|
||||
#ifdef DEBUG
|
||||
, mImageTracked(false)
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче