Process Custom Elements in post-order.

Source/core/dom/CustomElementRegistrationContext.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 40 matching lines @@
 
     if (!definition)
         return;
 
     // Upgrade elements that were waiting for this definition.
     const CustomElementUpgradeCandidateMap::ElementSet& upgradeCandidates = m_candidates.takeUpgradeCandidatesFor(definition->descriptor());
     for (CustomElementUpgradeCandidateMap::ElementSet::const_iterator it = upgradeCandidates.begin(); it != upgradeCandidates.end(); ++it)
         didResolveElement(definition, *it);
 }
 
-PassRefPtr<Element> CustomElementRegistrationContext::createCustomTagElement(Document* document, const QualifiedName& tagName)
+PassRefPtr<Element> CustomElementRegistrationContext::createCustomTagElement(Document* document, const QualifiedName& tagName, CreationMode mode)
 {
     ASSERT(CustomElement::isCustomTagName(tagName.localName()));
 
     if (!document)
         return 0;
 
     RefPtr<Element> element;
 
     if (HTMLNames::xhtmlNamespaceURI == tagName.namespaceURI()) {
         element = HTMLElement::create(tagName, document);
     } else if (SVGNames::svgNamespaceURI == tagName.namespaceURI()) {
         element = SVGUnknownElement::create(tagName, document);
     } else {
         // XML elements are not custom elements, so return early.
         return Element::create(tagName, document);
     }
 
-    element->setCustomElementState(Element::WaitingForUpgrade);
+    element->setCustomElementState(mode == CreatedByParser ? Element::WaitingForParser : Element::WaitingForUpgrade);
     resolve(element.get(), nullAtom);
     return element.release();
 }
 
 void CustomElementRegistrationContext::didGiveTypeExtension(Element* element, const AtomicString& type)
 {
     resolve(element, type);
 }
 
 void CustomElementRegistrationContext::resolve(Element* element, const AtomicString& typeExtension)
 {
     // If an element has a custom tag name it takes precedence over
     // the "is" attribute (if any).
     const AtomicString& type = CustomElement::isCustomTagName(element->localName())
         ? element->localName()
         : typeExtension;
     ASSERT(!type.isNull());
 
     CustomElementDescriptor descriptor(type, element->namespaceURI(), element->localName());
     CustomElementDefinition* definition = m_registry.find(descriptor);
     if (definition)
         didResolveElement(definition, element);
     else
         didCreateUnresolvedElement(descriptor, element);
 }
 
 void CustomElementRegistrationContext::didResolveElement(CustomElementDefinition* definition, Element* element)
 {
     CustomElement::define(element, definition);
-
-    switch (element->customElementState()) {
-    case Element::NotCustomElement:
-    case Element::Upgraded:
-        ASSERT_NOT_REACHED();
-        break;
-
-    case Element::WaitingForUpgrade:
-        CustomElementCallbackScheduler::scheduleCreatedCallback(definition->callbacks(), element);
-        break;
-    }
 }
 
 void CustomElementRegistrationContext::didCreateUnresolvedElement(const CustomElementDescriptor& descriptor, Element* element)
 {
-    ASSERT(element->customElementState() == Element::WaitingForUpgrade);
+    ASSERT(element->customElementState() == Element::WaitingForParser || element->customElementState() == Element::WaitingForUpgrade);
     m_candidates.add(descriptor, element);
 }
 
-void CustomElementRegistrationContext::customElementWasDestroyed(Element* element)
-{
-    m_candidates.remove(element);
-}
-
 PassRefPtr<CustomElementRegistrationContext> CustomElementRegistrationContext::create()
 {
     return adoptRef(new CustomElementRegistrationContext());
 }
 
 void CustomElementRegistrationContext::setIsAttributeAndTypeExtension(Element* element, const AtomicString& type)
 {
     ASSERT(element);
     ASSERT(!type.isEmpty());
     element->setAttribute(HTMLNames::isAttr, type);
     setTypeExtension(element, type);
 }
 
-void CustomElementRegistrationContext::setTypeExtension(Element* element, const AtomicString& type)
+void CustomElementRegistrationContext::setTypeExtension(Element* element, const AtomicString& type, CreationMode mode)
 {
     if (!element->isHTMLElement() && !element->isSVGElement())
         return;
 
     if (element->isCustomElement()) {
         // This can happen if:
         // 1. The element has a custom tag, which takes precedence over
         //    type extensions.
         // 2. Undoing a command (eg ReplaceNodeWithSpan) recycles an
         //    element but tries to overwrite its attribute list.
         return;
     }
 
     // Custom tags take precedence over type extensions
     ASSERT(!CustomElement::isCustomTagName(element->localName()));
 
-    element->setCustomElementState(Element::WaitingForUpgrade);
+    element->setCustomElementState(mode == CreatedByParser ? Element::WaitingForParser : Element::WaitingForUpgrade);
 
     if (CustomElementRegistrationContext* context = element->document()->registrationContext())
         context->didGiveTypeExtension(element, type);
 }
 
 } // namespace WebCore