Custom Elements: Complete HTMLConstructor Algorithm

third_party/WebKit/Source/core/dom/custom/CustomElementRegistry.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/custom/CustomElementRegistry.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptCustomElementDefinitionBuilder.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "core/HTMLElementTypeHelpers.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementDefinitionOptions.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/custom/CEReactionsScope.h"
 #include "core/dom/custom/CustomElement.h"
 #include "core/dom/custom/CustomElementDefinition.h"
 #include "core/dom/custom/CustomElementDefinitionBuilder.h"
 #include "core/dom/custom/CustomElementDescriptor.h"
 #include "core/dom/custom/CustomElementUpgradeReaction.h"
@@ skipping 91 matching lines @@
   if (nameIsDefined(name) || v0NameIsDefined(name)) {
     exceptionState.throwDOMException(
         NotSupportedError,
         "this name has already been used with this registry");
     return;
   }
 
   if (!builder.checkConstructorNotRegistered())
     return;
 
+  AtomicString localName = name;
+
   // Step 7. customized built-in elements definition
   // element interface extends option checks
   if (RuntimeEnabledFeatures::customElementsBuiltinEnabled() &&
       options.hasExtends()) {
-    // If element interface is valid custom element name, throw exception
+    // 7.1. If element interface is valid custom element name, throw exception
+    const AtomicString& extends = AtomicString(options.extends());
     if (throwIfValidName(AtomicString(options.extends()), exceptionState))
       return;
-    // If element interface is undefined element, throw exception
-    // Set localname to extends
+    // 7.2. If element interface is undefined element, throw exception
+    if (htmlElementTypeForTag(extends) == HTMLElementType::HTMLUnknownElement) {
+      exceptionState.throwDOMException(
+          NotSupportedError, "\"" + extends + "\" is an HTMLUnknownElement");
+      return;
+    }
+    // 7.3. Set localName to extends
+    localName = extends;
   }
 
   // TODO(dominicc): Add a test where the prototype getter destroys
   // the context.
 
   // 8. If this CustomElementRegistry's element definition is
   // running flag is set, then throw a "NotSupportedError"
   // DOMException and abort these steps.
   if (m_elementDefinitionIsRunning) {
     exceptionState.throwDOMException(
@@ skipping 12 matching lines @@
 
     // 10.3-6
     if (!builder.rememberOriginalProperties())
       return;
 
     // "Then, perform the following substep, regardless of whether
     // the above steps threw an exception or not: Unset this
     // CustomElementRegistry's element definition is running
     // flag."
     // (ElementDefinitionIsRunning destructor does this.)
+    // ElementDefinitionIsRunning destructor(m_elementDefinitionIsRunning);

[dominicc (has gone to gerrit), 2016/10/21 02:30:07]

I assume we still need this code?

   }
 
-  CustomElementDescriptor descriptor(name, name);
+  CustomElementDescriptor descriptor(name, localName);
   CustomElementDefinition* definition = builder.build(descriptor);
   CHECK(!exceptionState.hadException());
   CHECK(definition->descriptor() == descriptor);
   DefinitionMap::AddResult result =
       m_definitions.add(descriptor.name(), definition);
   CHECK(result.isNewEntry);
 
   HeapVector<Member<Element>> candidates;
   collectCandidates(descriptor, &candidates);
   for (Element* candidate : candidates)
@@ skipping 102 matching lines @@
   m_upgradeCandidates->remove(it);
 
   Document* document = m_owner->document();
   if (!document)
     return;
 
   sorter.sorted(elements, document);
 }
 
 }  // namespace blink