mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-08-24 05:13:07 +09:00
Bug 1334247 - Remove nsIAnonymousContentCreator::CreateFrameFor
Tag #1375
This commit is contained in:
parent
02ff2ef376
commit
499252b89f
6 changed files with 19 additions and 60 deletions
|
|
@ -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)
|
||||
|
|
@ -1352,16 +1353,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();
|
||||
|
|
@ -1386,7 +1380,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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue