Custom Elements: Check Definition in createElement, Create Customized Built-in Elements Sync

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 26 matching lines @@
 #include "bindings/core/v8/Microtask.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/StringOrDictionary.h"
 #include "bindings/core/v8/V0CustomElementConstructorBuilder.h"
 #include "bindings/core/v8/V8DOMWrapper.h"
 #include "bindings/core/v8/V8ElementCreationOptions.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "core/HTMLElementFactory.h"
+#include "core/HTMLElementTypeHelpers.h"
 #include "core/HTMLNames.h"
 #include "core/SVGElementFactory.h"
 #include "core/SVGNames.h"
 #include "core/XMLNSNames.h"
 #include "core/XMLNames.h"
 #include "core/animation/CompositorPendingAnimations.h"
 #include "core/animation/DocumentAnimations.h"
 #include "core/animation/DocumentTimeline.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSStyleDeclaration.h"
@@ skipping 649 matching lines @@
 
     return toCoreString(dict.v8Value()->ToString());
   }
 
   return emptyString();
 }
 
 Element* Document::createElement(const AtomicString& localName,
                                  const StringOrDictionary& stringOrOptions,
                                  ExceptionState& exceptionState) {
+  const AtomicString& is =
+      AtomicString(getTypeExtension(this, stringOrOptions, exceptionState));
+
   if (!isValidName(localName)) {
     exceptionState.throwDOMException(
         InvalidCharacterError,
         "The tag name provided ('" + localName + "') is not a valid name.");
     return nullptr;
   }
 
   Element* element;
 
-  if (CustomElement::shouldCreateCustomElement(convertLocalName(localName))) {
+  bool shouldCreateBuiltin =
+      stringOrOptions.isDictionary() &&
+      RuntimeEnabledFeatures::customElementsBuiltinEnabled();
+
+  if (CustomElement::shouldCreateCustomElement(convertLocalName(localName)) ||
+      shouldCreateBuiltin) {
     element = CustomElement::createCustomElementSync(
-        *this, convertLocalName(localName));
+        *this, convertLocalName(localName), is);
   } else if (V0CustomElement::isValidName(localName) && registrationContext()) {
     element = registrationContext()->createCustomTagElement(
         *this, QualifiedName(nullAtom, convertLocalName(localName),
                              xhtmlNamespaceURI));
   } else {
     element = createElement(localName, exceptionState);
     if (exceptionState.hadException())
       return nullptr;
   }
 
-  String typeExtention =
-      getTypeExtension(this, stringOrOptions, exceptionState);
-  if (!typeExtention.isEmpty()) {
-    V0CustomElementRegistrationContext::setIsAttributeAndTypeExtension(
-        element, AtomicString(typeExtention));
+  if (!is.isEmpty()) {
+    if (element->getCustomElementState() != CustomElementState::Custom) {
+      V0CustomElementRegistrationContext::setIsAttributeAndTypeExtension(
+          element, is);
+    } else if (stringOrOptions.isDictionary()) {
+      element->setAttribute(HTMLNames::isAttr, is);
+    }
   }
 
   return element;
 }
 
 static inline QualifiedName createQualifiedName(
     const AtomicString& namespaceURI,
     const AtomicString& qualifiedName,
     ExceptionState& exceptionState) {
   AtomicString prefix, localName;
@@ skipping 24 matching lines @@
 
   if (CustomElement::shouldCreateCustomElement(qName))
     return CustomElement::createCustomElementSync(*this, qName);
   return createElement(qName, CreatedByCreateElement);
 }
 
 Element* Document::createElementNS(const AtomicString& namespaceURI,
                                    const AtomicString& qualifiedName,
                                    const StringOrDictionary& stringOrOptions,
                                    ExceptionState& exceptionState) {
+  const AtomicString& is =
+      AtomicString(getTypeExtension(this, stringOrOptions, exceptionState));
+
+  if (!isValidName(qualifiedName)) {
+    exceptionState.throwDOMException(
+        InvalidCharacterError,
+        "The tag name provided ('" + qualifiedName + "') is not a valid name.");
+    return nullptr;
+  }
+
   QualifiedName qName(
       createQualifiedName(namespaceURI, qualifiedName, exceptionState));
   if (qName == QualifiedName::null())
     return nullptr;
 
   Element* element;
-  if (CustomElement::shouldCreateCustomElement(qName))
-    element = CustomElement::createCustomElementSync(*this, qName);
-  else if (V0CustomElement::isValidName(qName.localName()) &&
-           registrationContext())
+
+  bool shouldCreateBuiltin =

[dominicc (has gone to gerrit), 2016/11/10 03:43:09]

Maybe *may* create builtin is better? If the options are specified but empty/no
is, shouldCreateBuiltin is true. But in practice it may turn around and create
an autonomous custom element, or (what happens if "is" is missing and the name
isn't a valid custom element name? It looks like we'll call
createUndefinedElement which does not sound right.)

+      stringOrOptions.isDictionary() &&
+      RuntimeEnabledFeatures::customElementsBuiltinEnabled();
+
+  if (CustomElement::shouldCreateCustomElement(qName) || shouldCreateBuiltin) {
+    element = CustomElement::createCustomElementSync(*this, qName, is);
+  } else if (V0CustomElement::isValidName(qName.localName()) &&
+             registrationContext()) {
     element = registrationContext()->createCustomTagElement(*this, qName);
-  else
+  } else {
     element = createElement(qName, CreatedByCreateElement);
+  }
 
-  String typeExtention =
-      getTypeExtension(this, stringOrOptions, exceptionState);
-  if (!typeExtention.isEmpty()) {
-    V0CustomElementRegistrationContext::setIsAttributeAndTypeExtension(
-        element, AtomicString(typeExtention));
+  if (!is.isEmpty()) {
+    if (element->getCustomElementState() != CustomElementState::Custom) {

[dominicc (has gone to gerrit), 2016/11/10 03:43:09]

I'm not sure about this part. Doesn't v0-ish stuff often prevail over V1 at this
point?

+      V0CustomElementRegistrationContext::setIsAttributeAndTypeExtension(
+          element, is);
+    } else if (stringOrOptions.isDictionary()) {
+      element->setAttribute(HTMLNames::isAttr, is);
+    }
   }
 
   return element;
 }
 
 ScriptValue Document::registerElement(ScriptState* scriptState,
                                       const AtomicString& name,
                                       const ElementRegistrationOptions& options,
                                       ExceptionState& exceptionState,
                                       V0CustomElement::NameSet validNames) {
@@ skipping 5652 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif