corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 852428 part 2. Make nsIFrame::Init infallible. r=dholbert

Browse Source
This commit is contained in:
Boris Zbarsky
2013-03-19 21:47:48 -04:00
parent 227171bc03
commit c0d4537026
121 changed files with 372 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
layout/forms/nsComboboxControlFrame.cpp
View File

@@ -1371,12 +1371,7 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
return nullptr;
}
nsresult rv = mDisplayFrame->Init(mContent, this, nullptr);
if (NS_FAILED(rv)) {
mDisplayFrame->Destroy();
mDisplayFrame = nullptr;
return nullptr;
}
mDisplayFrame->Init(mContent, this, nullptr);
// Create a text frame and put it inside the block frame
nsIFrame* textFrame = NS_NewTextFrame(shell, textStyleContext);
@@ -1385,14 +1380,7 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
}
// initialize the text frame
rv = textFrame->Init(aContent, mDisplayFrame, nullptr);
if (NS_FAILED(rv)) {
mDisplayFrame->Destroy();
mDisplayFrame = nullptr;
textFrame->Destroy();
textFrame = nullptr;
return nullptr;
}
textFrame->Init(aContent, mDisplayFrame, nullptr);
mDisplayContent->SetPrimaryFrame(textFrame);
nsFrameList textList(textFrame, textFrame);