Remove custom element upgrades.

sky/engine/core/dom/custom/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 26 matching lines @@
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/dom/custom/CustomElement.h"
 #include "sky/engine/core/dom/custom/CustomElementDefinition.h"
 #include "sky/engine/core/dom/custom/CustomElementScheduler.h"
 #include "sky/engine/core/html/HTMLElement.h"
 #include "sky/engine/wtf/RefPtr.h"
 
 namespace blink {
 
 CustomElementRegistrationContext::CustomElementRegistrationContext()
-    : m_candidates(CustomElementUpgradeCandidateMap::create())
 {
 }
 
 void CustomElementRegistrationContext::registerElement(Document* document, CustomElementConstructorBuilder* constructorBuilder, const AtomicString& type, CustomElement::NameSet validNames, ExceptionState& exceptionState)
 {
-    CustomElementDefinition* definition = m_registry.registerElement(document, constructorBuilder, type, validNames, exceptionState);
-
-    if (!definition)
-        return;
-
-    // Upgrade elements that were waiting for this definition.
-    OwnPtr<CustomElementUpgradeCandidateMap::ElementSet> upgradeCandidates = m_candidates->takeUpgradeCandidatesFor(definition->descriptor());
-
-    if (!upgradeCandidates)
-        return;
-
-    for (CustomElementUpgradeCandidateMap::ElementSet::const_iterator it = upgradeCandidates->begin(); it != upgradeCandidates->end(); ++it)
-        CustomElement::define(*it, definition);
+    m_registry.registerElement(document, constructorBuilder, type, validNames, exceptionState);
 }
 
 PassRefPtr<Element> CustomElementRegistrationContext::createCustomTagElement(Document& document, const QualifiedName& tagName)
 {
     ASSERT(CustomElement::isValidName(tagName.localName()));
 
     RefPtr<Element> element = HTMLElement::create(tagName, document);
     element->setCustomElementState(Element::WaitingForUpgrade);
     resolveOrScheduleResolution(element.get());
     return element.release();
 }
 
 void CustomElementRegistrationContext::resolveOrScheduleResolution(Element* element)
 {
     CustomElementDescriptor descriptor(element->localName());
     ASSERT(element->customElementState() == Element::WaitingForUpgrade);
 
     CustomElementScheduler::resolveOrScheduleResolution(this, element, descriptor);
 }
 
 void CustomElementRegistrationContext::resolve(Element* element, const CustomElementDescriptor& descriptor)
 {
-    CustomElementDefinition* definition = m_registry.find(descriptor);
-    if (definition) {
+    if (CustomElementDefinition* definition = m_registry.find(descriptor))
         CustomElement::define(element, definition);
-    } else {
-        ASSERT(element->customElementState() == Element::WaitingForUpgrade);
-        m_candidates->add(descriptor, element);
-    }
 }
 
 } // namespace blink