зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1190608, part 4 - Brace a few ifs in nsXULElement.cpp. r=poiru
This commit is contained in:
Родитель
c9f23a2889
Коммит
0da5862c52
|
@ -2279,8 +2279,9 @@ nsXULPrototypeElement::Deserialize(nsIObjectInputStream* aStream,
|
||||||
uint32_t number = 0;
|
uint32_t number = 0;
|
||||||
nsresult rv = aStream->Read32(&number);
|
nsresult rv = aStream->Read32(&number);
|
||||||
mNodeInfo = aNodeInfos->SafeElementAt(number, nullptr);
|
mNodeInfo = aNodeInfos->SafeElementAt(number, nullptr);
|
||||||
if (!mNodeInfo)
|
if (!mNodeInfo) {
|
||||||
return NS_ERROR_UNEXPECTED;
|
return NS_ERROR_UNEXPECTED;
|
||||||
|
}
|
||||||
|
|
||||||
// Read Attributes
|
// Read Attributes
|
||||||
nsresult tmp = aStream->Read32(&number);
|
nsresult tmp = aStream->Read32(&number);
|
||||||
|
@ -2292,8 +2293,9 @@ nsXULPrototypeElement::Deserialize(nsIObjectInputStream* aStream,
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
if (mNumAttributes > 0) {
|
if (mNumAttributes > 0) {
|
||||||
mAttributes = new (fallible) nsXULPrototypeAttribute[mNumAttributes];
|
mAttributes = new (fallible) nsXULPrototypeAttribute[mNumAttributes];
|
||||||
if (! mAttributes)
|
if (!mAttributes) {
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
return NS_ERROR_OUT_OF_MEMORY;
|
||||||
|
}
|
||||||
|
|
||||||
nsAutoString attributeValue;
|
nsAutoString attributeValue;
|
||||||
for (i = 0; i < mNumAttributes; ++i) {
|
for (i = 0; i < mNumAttributes; ++i) {
|
||||||
|
@ -2302,8 +2304,9 @@ nsXULPrototypeElement::Deserialize(nsIObjectInputStream* aStream,
|
||||||
rv = tmp;
|
rv = tmp;
|
||||||
}
|
}
|
||||||
mozilla::dom::NodeInfo* ni = aNodeInfos->SafeElementAt(number, nullptr);
|
mozilla::dom::NodeInfo* ni = aNodeInfos->SafeElementAt(number, nullptr);
|
||||||
if (!ni)
|
if (!ni) {
|
||||||
return NS_ERROR_UNEXPECTED;
|
return NS_ERROR_UNEXPECTED;
|
||||||
|
}
|
||||||
|
|
||||||
mAttributes[i].mName.SetTo(ni);
|
mAttributes[i].mName.SetTo(ni);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче