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

Bug 899900 - Avoid null checking result of NS_NewBlahFrame. r=dbaron

Browse Source
This commit is contained in:
Cameron McCormack
2013-08-03 14:11:06 +10:00
parent ff3497535d
commit d443d347c8
8 changed files with 36 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
layout/forms/nsComboboxControlFrame.cpp
View File

@@ -1330,19 +1330,12 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
nsRefPtr<nsStyleContext> textStyleContext;
textStyleContext = styleSet->ResolveStyleForNonElement(mStyleContext);
// Start by by creating our anonymous block frame
// Start by creating our anonymous block frame
mDisplayFrame = new (shell) nsComboboxDisplayFrame(styleContext, this);
if (MOZ_UNLIKELY(!mDisplayFrame)) {
return nullptr;
}
mDisplayFrame->Init(mContent, this, nullptr);
// Create a text frame and put it inside the block frame
nsIFrame* textFrame = NS_NewTextFrame(shell, textStyleContext);
if (MOZ_UNLIKELY(!textFrame)) {
return nullptr;
}
// initialize the text frame
textFrame->Init(aContent, mDisplayFrame, nullptr);