зеркало из https://github.com/mozilla/gecko-dev.git
Bug 502567. Get rid of the silly ShouldBuildChildFrames check. r=neil
This commit is contained in:
Родитель
b7cb026b86
Коммит
ca305158f8
|
@ -1373,14 +1373,6 @@ nsBindingManager::MediumFeaturesChanged(nsPresContext* aPresContext,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsBindingManager::ShouldBuildChildFrames(nsIContent* aContent)
|
||||
{
|
||||
nsXBLBinding *binding = GetBinding(aContent);
|
||||
|
||||
return !binding || binding->ShouldBuildChildFrames();
|
||||
}
|
||||
|
||||
nsIContent*
|
||||
nsBindingManager::GetNestedInsertionPoint(nsIContent* aParent, nsIContent* aChild)
|
||||
{
|
||||
|
|
|
@ -195,8 +195,6 @@ public:
|
|||
|
||||
nsresult GetBindingImplementation(nsIContent* aContent, REFNSIID aIID, void** aResult);
|
||||
|
||||
PRBool ShouldBuildChildFrames(nsIContent* aContent);
|
||||
|
||||
// Style rule methods
|
||||
nsresult WalkRules(nsIStyleRuleProcessor::EnumFunc aFunc,
|
||||
RuleProcessorData* aData,
|
||||
|
|
|
@ -1589,15 +1589,3 @@ nsXBLBinding::GetAnonymousNodes()
|
|||
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsXBLBinding::ShouldBuildChildFrames() const
|
||||
{
|
||||
if (mContent)
|
||||
return mPrototypeBinding->ShouldBuildChildFrames();
|
||||
|
||||
if (mNextBinding)
|
||||
return mNextBinding->ShouldBuildChildFrames();
|
||||
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
|
|
@ -116,7 +116,6 @@ public:
|
|||
PRBool HasStyleSheets() const;
|
||||
PRBool InheritsStyle() const;
|
||||
PRBool ImplementsInterface(REFNSIID aIID) const;
|
||||
PRBool ShouldBuildChildFrames() const;
|
||||
|
||||
void GenerateAnonymousContent();
|
||||
void InstallAnonymousContent(nsIContent* aAnonParent, nsIContent* aElement);
|
||||
|
|
|
@ -1057,23 +1057,6 @@ nsXBLPrototypeBinding::GetStyleSheets()
|
|||
return nsnull;
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsXBLPrototypeBinding::ShouldBuildChildFrames() const
|
||||
{
|
||||
if (!mAttributeTable)
|
||||
return PR_TRUE;
|
||||
nsPRUint32Key nskey(kNameSpaceID_XBL);
|
||||
nsObjectHashtable* xblAttributes =
|
||||
static_cast<nsObjectHashtable*>(mAttributeTable->Get(&nskey));
|
||||
if (xblAttributes) {
|
||||
nsISupportsKey key(nsGkAtoms::text);
|
||||
void* entry = xblAttributes->Get(&key);
|
||||
return !entry;
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
static PRBool
|
||||
DeleteAttributeEntry(nsHashKey* aKey, void* aData, void* aClosure)
|
||||
{
|
||||
|
|
|
@ -171,8 +171,6 @@ public:
|
|||
|
||||
PRBool ImplementsInterface(REFNSIID aIID) const;
|
||||
|
||||
PRBool ShouldBuildChildFrames() const;
|
||||
|
||||
nsresult AddResourceListener(nsIContent* aBoundElement);
|
||||
|
||||
void Initialize();
|
||||
|
|
|
@ -9553,8 +9553,7 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
|
|||
itemsToConstruct);
|
||||
}
|
||||
|
||||
if (!aFrame->IsLeaf() &&
|
||||
mDocument->BindingManager()->ShouldBuildChildFrames(aContent)) {
|
||||
if (!aFrame->IsLeaf()) {
|
||||
// :before/:after content should have the same style context parent
|
||||
// as normal kids.
|
||||
// Note that we don't use this style context for looking up things like
|
||||
|
|
Загрузка…
Ссылка в новой задаче