KotJohansson/UXP-Fixed
1
0
Fork 0
mirror of https://github.com/ManchildProductions/UXP-Fixed.git synced 2026-05-27 19:48:48 +00:00
Code Issues Projects Releases Wiki Activity

Bug 1334247 - Remove nsIAnonymousContentCreator::CreateFrameFor

Browse Source 
Tag #1375
This commit is contained in:
Matt A. Tobin
2020-04-14 22:04:32 -04:00
parent b356448d14
commit e215bfbb80
6 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/forms/nsComboboxControlFrame.cpp
+4 -10
View File
@@ -249,6 +249,7 @@ nsComboboxControlFrame::~nsComboboxControlFrame()
//--------------------------------------------------------------
NS_QUERYFRAME_HEAD(nsComboboxControlFrame)
NS_QUERYFRAME_ENTRY(nsComboboxControlFrame)
NS_QUERYFRAME_ENTRY(nsIComboboxControlFrame)
NS_QUERYFRAME_ENTRY(nsIFormControlFrame)
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
@@ -1350,16 +1351,9 @@ nsComboboxDisplayFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
nsIFrame*
nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
nsComboboxControlFrame::CreateFrameForDisplayNode()
{
NS_PRECONDITION(nullptr != aContent, "null ptr");
NS_ASSERTION(mDisplayContent, "mDisplayContent can't be null!");
if (mDisplayContent != aContent) {
// We only handle the frames for mDisplayContent here
return nullptr;
}
MOZ_ASSERT(mDisplayContent);
// Get PresShell
nsIPresShell *shell = PresContext()->PresShell();
@@ -1384,7 +1378,7 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
nsIFrame* textFrame = NS_NewTextFrame(shell, textStyleContext);
// initialize the text frame
textFrame->Init(aContent, mDisplayFrame, nullptr);
textFrame->Init(mDisplayContent, mDisplayFrame, nullptr);
mDisplayContent->SetPrimaryFrame(textFrame);
nsFrameList textList(textFrame, textFrame);