| Index: third_party/WebKit/Source/core/dom/custom/V0CustomElementRegistrationContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp b/third_party/WebKit/Source/core/dom/custom/V0CustomElementRegistrationContext.cpp
|
| similarity index 63%
|
| rename from third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp
|
| rename to third_party/WebKit/Source/core/dom/custom/V0CustomElementRegistrationContext.cpp
|
| index 4496cd196baea08876115bb985d441c10f89046f..ee05a67de77277b8085aa68f9e3992ac67012031 100644
|
| --- a/third_party/WebKit/Source/core/dom/custom/CustomElementRegistrationContext.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/custom/V0CustomElementRegistrationContext.cpp
|
| @@ -28,47 +28,47 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "core/dom/custom/CustomElementRegistrationContext.h"
|
| +#include "core/dom/custom/V0CustomElementRegistrationContext.h"
|
|
|
| #include "bindings/core/v8/ExceptionState.h"
|
| #include "core/HTMLNames.h"
|
| #include "core/SVGNames.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/Element.h"
|
| -#include "core/dom/custom/CustomElement.h"
|
| -#include "core/dom/custom/CustomElementDefinition.h"
|
| -#include "core/dom/custom/CustomElementScheduler.h"
|
| +#include "core/dom/custom/V0CustomElement.h"
|
| +#include "core/dom/custom/V0CustomElementDefinition.h"
|
| +#include "core/dom/custom/V0CustomElementScheduler.h"
|
| #include "core/html/HTMLElement.h"
|
| #include "core/html/HTMLUnknownElement.h"
|
| #include "core/svg/SVGUnknownElement.h"
|
|
|
| namespace blink {
|
|
|
| -CustomElementRegistrationContext::CustomElementRegistrationContext()
|
| - : m_candidates(CustomElementUpgradeCandidateMap::create())
|
| +V0CustomElementRegistrationContext::V0CustomElementRegistrationContext()
|
| + : m_candidates(V0CustomElementUpgradeCandidateMap::create())
|
| {
|
| }
|
|
|
| -void CustomElementRegistrationContext::registerElement(Document* document, CustomElementConstructorBuilder* constructorBuilder, const AtomicString& type, CustomElement::NameSet validNames, ExceptionState& exceptionState)
|
| +void V0CustomElementRegistrationContext::registerElement(Document* document, V0CustomElementConstructorBuilder* constructorBuilder, const AtomicString& type, V0CustomElement::NameSet validNames, ExceptionState& exceptionState)
|
| {
|
| - CustomElementDefinition* definition = m_registry.registerElement(document, constructorBuilder, type, validNames, exceptionState);
|
| + V0CustomElementDefinition* definition = m_registry.registerElement(document, constructorBuilder, type, validNames, exceptionState);
|
|
|
| if (!definition)
|
| return;
|
|
|
| // Upgrade elements that were waiting for this definition.
|
| - CustomElementUpgradeCandidateMap::ElementSet* upgradeCandidates = m_candidates->takeUpgradeCandidatesFor(definition->descriptor());
|
| + V0CustomElementUpgradeCandidateMap::ElementSet* upgradeCandidates = m_candidates->takeUpgradeCandidatesFor(definition->descriptor());
|
|
|
| if (!upgradeCandidates)
|
| return;
|
|
|
| for (const auto& candidate : *upgradeCandidates)
|
| - CustomElement::define(candidate, definition);
|
| + V0CustomElement::define(candidate, definition);
|
| }
|
|
|
| -Element* CustomElementRegistrationContext::createCustomTagElement(Document& document, const QualifiedName& tagName)
|
| +Element* V0CustomElementRegistrationContext::createCustomTagElement(Document& document, const QualifiedName& tagName)
|
| {
|
| - DCHECK(CustomElement::isValidName(tagName.localName()));
|
| + DCHECK(V0CustomElement::isValidName(tagName.localName()));
|
|
|
| Element* element;
|
|
|
| @@ -86,38 +86,38 @@ Element* CustomElementRegistrationContext::createCustomTagElement(Document& docu
|
| return element;
|
| }
|
|
|
| -void CustomElementRegistrationContext::didGiveTypeExtension(Element* element, const AtomicString& type)
|
| +void V0CustomElementRegistrationContext::didGiveTypeExtension(Element* element, const AtomicString& type)
|
| {
|
| resolveOrScheduleResolution(element, type);
|
| }
|
|
|
| -void CustomElementRegistrationContext::resolveOrScheduleResolution(Element* element, const AtomicString& typeExtension)
|
| +void V0CustomElementRegistrationContext::resolveOrScheduleResolution(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::isValidName(element->localName())
|
| + const AtomicString& type = V0CustomElement::isValidName(element->localName())
|
| ? element->localName()
|
| : typeExtension;
|
| DCHECK(!type.isNull());
|
|
|
| - CustomElementDescriptor descriptor(type, element->namespaceURI(), element->localName());
|
| + V0CustomElementDescriptor descriptor(type, element->namespaceURI(), element->localName());
|
| DCHECK_EQ(element->getCustomElementState(), Element::WaitingForUpgrade);
|
|
|
| - CustomElementScheduler::resolveOrScheduleResolution(this, element, descriptor);
|
| + V0CustomElementScheduler::resolveOrScheduleResolution(this, element, descriptor);
|
| }
|
|
|
| -void CustomElementRegistrationContext::resolve(Element* element, const CustomElementDescriptor& descriptor)
|
| +void V0CustomElementRegistrationContext::resolve(Element* element, const V0CustomElementDescriptor& descriptor)
|
| {
|
| - CustomElementDefinition* definition = m_registry.find(descriptor);
|
| + V0CustomElementDefinition* definition = m_registry.find(descriptor);
|
| if (definition) {
|
| - CustomElement::define(element, definition);
|
| + V0CustomElement::define(element, definition);
|
| } else {
|
| DCHECK_EQ(element->getCustomElementState(), Element::WaitingForUpgrade);
|
| m_candidates->add(descriptor, element);
|
| }
|
| }
|
|
|
| -void CustomElementRegistrationContext::setIsAttributeAndTypeExtension(Element* element, const AtomicString& type)
|
| +void V0CustomElementRegistrationContext::setIsAttributeAndTypeExtension(Element* element, const AtomicString& type)
|
| {
|
| DCHECK(element);
|
| DCHECK(!type.isEmpty());
|
| @@ -125,12 +125,12 @@ void CustomElementRegistrationContext::setIsAttributeAndTypeExtension(Element* e
|
| setTypeExtension(element, type);
|
| }
|
|
|
| -void CustomElementRegistrationContext::setTypeExtension(Element* element, const AtomicString& type)
|
| +void V0CustomElementRegistrationContext::setTypeExtension(Element* element, const AtomicString& type)
|
| {
|
| if (!element->isHTMLElement() && !element->isSVGElement())
|
| return;
|
|
|
| - CustomElementRegistrationContext* context = element->document().registrationContext();
|
| + V0CustomElementRegistrationContext* context = element->document().registrationContext();
|
| if (!context)
|
| return;
|
|
|
| @@ -144,16 +144,16 @@ void CustomElementRegistrationContext::setTypeExtension(Element* element, const
|
| }
|
|
|
| // Custom tags take precedence over type extensions
|
| - DCHECK(!CustomElement::isValidName(element->localName()));
|
| + DCHECK(!V0CustomElement::isValidName(element->localName()));
|
|
|
| - if (!CustomElement::isValidName(type))
|
| + if (!V0CustomElement::isValidName(type))
|
| return;
|
|
|
| element->setCustomElementState(Element::WaitingForUpgrade);
|
| context->didGiveTypeExtension(element, element->document().convertLocalName(type));
|
| }
|
|
|
| -DEFINE_TRACE(CustomElementRegistrationContext)
|
| +DEFINE_TRACE(V0CustomElementRegistrationContext)
|
| {
|
| visitor->trace(m_candidates);
|
| visitor->trace(m_registry);
|
|
|