mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-08-15 08:53:07 +09:00
Revert "Optimise WebExtension implementaion pt.1"
This reverts commit 3be08bc94b.
This commit is contained in:
parent
3be08bc94b
commit
cd6be07458
3 changed files with 19 additions and 22 deletions
|
|
@ -1278,9 +1278,6 @@ CustomElementDefinition::CustomElementDefinition(nsIAtom* aType,
|
|||
mCallbacks(aCallbacks),
|
||||
mDocOrder(aDocOrder)
|
||||
{
|
||||
for (uint32_t i = 0; i < mObservedAttributes.Length(); ++i) {
|
||||
mObservedAttributesSet.PutEntry(mObservedAttributes[i]);
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@
|
|||
#include "mozilla/dom/WebComponentsBinding.h"
|
||||
#include "nsCycleCollectionParticipant.h"
|
||||
#include "nsGenericHTMLElement.h"
|
||||
#include "nsHashKeys.h"
|
||||
#include "nsTHashtable.h"
|
||||
#include "nsWrapperCache.h"
|
||||
|
||||
class nsDocument;
|
||||
|
|
@ -168,9 +166,6 @@ struct CustomElementDefinition
|
|||
// The list of attributes that this custom element observes.
|
||||
nsCOMArray<nsIAtom> mObservedAttributes;
|
||||
|
||||
// Hash set for O(1) lookup of observed attributes.
|
||||
nsTHashtable<nsISupportsHashKey> mObservedAttributesSet;
|
||||
|
||||
// The prototype to use for new custom elements of this type.
|
||||
JS::Heap<JSObject *> mPrototype;
|
||||
|
||||
|
|
@ -194,7 +189,7 @@ struct CustomElementDefinition
|
|||
return false;
|
||||
}
|
||||
|
||||
return mObservedAttributesSet.Contains(aName);
|
||||
return mObservedAttributes.Contains(aName);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ ShadowRoot::AddSlot(HTMLSlotElement* aSlot)
|
|||
MOZ_ASSERT(aSlot);
|
||||
|
||||
// Note that if name attribute missing, the slot is a default slot.
|
||||
nsAutoString name;
|
||||
nsAutoString name;
|
||||
aSlot->GetName(name);
|
||||
|
||||
nsTArray<HTMLSlotElement*>* currentSlots = mSlotMap.LookupOrAdd(name);
|
||||
|
|
@ -162,14 +162,25 @@ ShadowRoot::AddSlot(HTMLSlotElement* aSlot)
|
|||
|
||||
oldSlot->RemoveAssignedNode(assignedNode);
|
||||
currentSlot->AppendAssignedNode(assignedNode);
|
||||
|
||||
Element* restyleElement;
|
||||
if (assignedNode->IsElement()) {
|
||||
restyleElement = assignedNode->AsElement();
|
||||
} else {
|
||||
// This is likely a text node. Use the host instead.
|
||||
restyleElement = GetHost();
|
||||
}
|
||||
if (restyleElement) {
|
||||
nsLayoutUtils::PostRestyleEvent(
|
||||
restyleElement, eRestyle_Subtree, nsChangeHint(0));
|
||||
}
|
||||
|
||||
doEnqueueSlotChange = true;
|
||||
}
|
||||
|
||||
if (doEnqueueSlotChange) {
|
||||
oldSlot->EnqueueSlotChangeEvent();
|
||||
currentSlot->EnqueueSlotChangeEvent();
|
||||
nsLayoutUtils::PostRestyleEvent(
|
||||
GetHost(), eRestyle_Subtree, nsChangeHint(0));
|
||||
}
|
||||
} else {
|
||||
// Otherwise add appropriate nodes to this slot from the host.
|
||||
|
|
@ -464,10 +475,7 @@ ShadowRoot::MaybeReassignElement(Element* aElement,
|
|||
void
|
||||
ShadowRoot::DistributionChanged()
|
||||
{
|
||||
if (mSlotMap.IsEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// FIXME(emilio): We could be more granular in a bunch of cases.
|
||||
auto* host = GetHost();
|
||||
if (!host || !host->IsInComposedDoc()) {
|
||||
return;
|
||||
|
|
@ -543,11 +551,8 @@ ShadowRoot::AttributeChanged(nsIDocument* aDocument,
|
|||
return;
|
||||
}
|
||||
|
||||
if (aElement->GetPrimaryFrame()) {
|
||||
shell->DestroyFramesForAndRestyle(aElement);
|
||||
} else {
|
||||
nsLayoutUtils::PostRestyleEvent(aElement, eRestyle_Subtree, nsChangeHint(0));
|
||||
}
|
||||
//XXX optimize this!
|
||||
shell->DestroyFramesForAndRestyle(aElement);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -559,7 +564,7 @@ ShadowRoot::ContentAppended(nsIDocument* aDocument,
|
|||
for (nsIContent* content = aFirstNewContent;
|
||||
content;
|
||||
content = content->GetNextSibling()) {
|
||||
ContentInserted(aDocument, aContainer, content, aNewIndexInContainer);
|
||||
ContentInserted(aDocument, aContainer, aFirstNewContent, aNewIndexInContainer);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue