diff options
Diffstat (limited to 'dom')
| -rw-r--r-- | dom/base/CustomElementRegistry.cpp | 5 | ||||
| -rw-r--r-- | dom/base/CustomElementRegistry.h | 2 | ||||
| -rw-r--r-- | dom/base/nsContentUtils.cpp | 8 | ||||
| -rw-r--r-- | dom/base/nsContentUtils.h | 2 | ||||
| -rw-r--r-- | dom/base/nsNodeUtils.cpp | 4 | ||||
| -rw-r--r-- | dom/html/nsHTMLContentSink.cpp | 3 |
6 files changed, 14 insertions, 10 deletions
diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp index 47601aabb..99452df65 100644 --- a/dom/base/CustomElementRegistry.cpp +++ b/dom/base/CustomElementRegistry.cpp @@ -243,12 +243,11 @@ CustomElementRegistry::~CustomElementRegistry() } CustomElementDefinition* -CustomElementRegistry::LookupCustomElementDefinition(const nsAString& aLocalName, +CustomElementRegistry::LookupCustomElementDefinition(nsIAtom* aNameAtom, nsIAtom* aTypeAtom) const { - nsCOMPtr<nsIAtom> localNameAtom = NS_Atomize(aLocalName); CustomElementDefinition* data = mCustomDefinitions.GetWeak(aTypeAtom); - if (data && data->mLocalName == localNameAtom) { + if (data && data->mLocalName == aNameAtom) { return data; } diff --git a/dom/base/CustomElementRegistry.h b/dom/base/CustomElementRegistry.h index 01c32a595..c416e5043 100644 --- a/dom/base/CustomElementRegistry.h +++ b/dom/base/CustomElementRegistry.h @@ -412,7 +412,7 @@ public: * https://html.spec.whatwg.org/#look-up-a-custom-element-definition */ CustomElementDefinition* LookupCustomElementDefinition( - const nsAString& aLocalName, nsIAtom* aTypeAtom) const; + nsIAtom* aNameAtom, nsIAtom* aTypeAtom) const; CustomElementDefinition* LookupCustomElementDefinition( JSContext* aCx, JSObject *aConstructor) const; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 402dfd1c5..b6cbbbace 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -9536,9 +9536,11 @@ nsContentUtils::TryToUpgradeElement(Element* aElement) NodeInfo* nodeInfo = aElement->NodeInfo(); RefPtr<nsIAtom> typeAtom = aElement->GetCustomElementData()->GetCustomElementType(); + + MOZ_ASSERT(nodeInfo->NameAtom()->Equals(nodeInfo->LocalName())); CustomElementDefinition* definition = nsContentUtils::LookupCustomElementDefinition(nodeInfo->GetDocument(), - nodeInfo->LocalName(), + nodeInfo->NameAtom(), nodeInfo->NamespaceID(), typeAtom); if (definition) { @@ -9553,7 +9555,7 @@ nsContentUtils::TryToUpgradeElement(Element* aElement) /* static */ CustomElementDefinition* nsContentUtils::LookupCustomElementDefinition(nsIDocument* aDoc, - const nsAString& aLocalName, + nsIAtom* aNameAtom, uint32_t aNameSpaceID, nsIAtom* aTypeAtom) { @@ -9577,7 +9579,7 @@ nsContentUtils::LookupCustomElementDefinition(nsIDocument* aDoc, return nullptr; } - return registry->LookupCustomElementDefinition(aLocalName, aTypeAtom); + return registry->LookupCustomElementDefinition(aNameAtom, aTypeAtom); } /* static */ void diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 4200a0621..bf6a59dcd 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2712,7 +2712,7 @@ public: */ static mozilla::dom::CustomElementDefinition* LookupCustomElementDefinition(nsIDocument* aDoc, - const nsAString& aLocalName, + nsIAtom* aNameAtom, uint32_t aNameSpaceID, nsIAtom* aTypeAtom); diff --git a/dom/base/nsNodeUtils.cpp b/dom/base/nsNodeUtils.cpp index f79da6652..384e56cde 100644 --- a/dom/base/nsNodeUtils.cpp +++ b/dom/base/nsNodeUtils.cpp @@ -497,9 +497,11 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep, if (data || !extension.IsEmpty()) { RefPtr<nsIAtom> typeAtom = extension.IsEmpty() ? tagAtom : NS_Atomize(extension); cloneElem->SetCustomElementData(new CustomElementData(typeAtom)); + + MOZ_ASSERT(nodeInfo->NameAtom()->Equals(nodeInfo->LocalName())); CustomElementDefinition* definition = nsContentUtils::LookupCustomElementDefinition(nodeInfo->GetDocument(), - nodeInfo->LocalName(), + nodeInfo->NameAtom(), nodeInfo->NamespaceID(), typeAtom); if (definition) { diff --git a/dom/html/nsHTMLContentSink.cpp b/dom/html/nsHTMLContentSink.cpp index 920ded728..1fe5d2a86 100644 --- a/dom/html/nsHTMLContentSink.cpp +++ b/dom/html/nsHTMLContentSink.cpp @@ -287,9 +287,10 @@ NS_NewHTMLElement(Element** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& CustomElementDefinition* definition = aDefinition; if (CustomElementRegistry::IsCustomElementEnabled() && isCustomElement && !definition) { + MOZ_ASSERT(nodeInfo->NameAtom()->Equals(nodeInfo->LocalName())); definition = nsContentUtils::LookupCustomElementDefinition(nodeInfo->GetDocument(), - nodeInfo->LocalName(), + nodeInfo->NameAtom(), nodeInfo->NamespaceID(), typeAtom); } |