KotJohansson/UXP-Fixed
1
0
Fork 0
mirror of https://github.com/ManchildProductions/UXP-Fixed.git synced 2026-05-27 13:58:32 +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/base/nsCSSFrameConstructor.cpp
+11 -16
View File
@@ -43,6 +43,7 @@
#include "nsContainerFrame.h"
#include "nsNameSpaceManager.h"
#include "nsIComboboxControlFrame.h"
#include "nsComboboxControlFrame.h"
#include "nsIListControlFrame.h"
#include "nsIDOMCharacterData.h"
#include "nsPlaceholderFrame.h"
@@ -4121,9 +4122,7 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
ancestorPusher.PushStyleScope(aParent->AsElement());
}
nsIAnonymousContentCreator* creator = do_QueryFrame(aParentFrame);
NS_ASSERTION(creator,
"How can that happen if we have nodes to construct frames for?");
nsComboboxControlFrame* comboboxFrame = do_QueryFrame(aParentFrame);
InsertionPoint insertion(aParentFrame, aParent);
for (uint32_t i=0; i < count; i++) {
@@ -4135,12 +4134,15 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
"nsIAnonymousContentCreator::CreateAnonymousContent to "
"output a list where the items have their own children");
nsIFrame* newFrame = creator->CreateFrameFor(content);
if (newFrame) {
NS_ASSERTION(content->GetPrimaryFrame(),
"Content must have a primary frame now");
newFrame->AddStateBits(NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT);
aChildItems.AddChild(newFrame);
if (comboboxFrame && comboboxFrame->GetDisplayNode() == content) {
// Combo box frames have a custom hook to create frames for the anonymous
// text node. This is the last vestigial trace of an old custom hook that
// allowed arbitrary custom frame creation by any nsIAnonymousContentCreator
// implementation. It's possible that this could all be refactored away.
nsIFrame* customFrame = comboboxFrame->CreateFrameForDisplayNode();
MOZ_ASSERT(customFrame);
customFrame->AddStateBits(NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT);
aChildItems.AddChild(customFrame);
} else {
FrameConstructionItemList items;
{
@@ -10660,13 +10662,6 @@ nsCSSFrameConstructor::AddFCItemsForAnonymousContent(
{
for (uint32_t i = 0; i < aAnonymousItems.Length(); ++i) {
nsIContent* content = aAnonymousItems[i].mContent;
#ifdef DEBUG
nsIAnonymousContentCreator* creator = do_QueryFrame(aFrame);
NS_ASSERTION(!creator || !creator->CreateFrameFor(content),
"If you need to use CreateFrameFor, you need to call "
"CreateAnonymousFrames manually and not follow the standard "
"ProcessChildren() codepath for this frame");
#endif
// Gecko-styled nodes should have no pending restyle flags.
MOZ_ASSERT_IF(!content->IsStyledByServo(),
!content->IsElement() ||