Introduce CustomElementRegistry#whenDefined() method

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

Index: third_party/WebKit/Source/core/dom/custom/CustomElementsRegistry.cpp
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementsRegistry.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementsRegistry.cpp
index 6a00f4321bf074ad1580819757cf24ed19a5662d..ca2de4d1d0758c1d207a55a6125ab24898101e1f 100644
--- a/third_party/WebKit/Source/core/dom/custom/CustomElementsRegistry.cpp
+++ b/third_party/WebKit/Source/core/dom/custom/CustomElementsRegistry.cpp
@@ -6,6 +6,8 @@
 
 #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/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementRegistrationOptions.h"
@@ -22,6 +24,21 @@
 
 namespace blink {
 
+namespace {
+// Returns true if |name| is invalid.
+bool throwIfInvalidName(
+    const AtomicString& name,
+    ExceptionState& exceptionState)
+{
+    if (CustomElement::isValidName(name))
+        return false;
+    exceptionState.throwDOMException(
+        SyntaxError,
+        "\"" + name + "\" is not a valid custom element name");
+    return true;
+}
+} // namespace

[dominicc (has gone to gerrit), 2016/06/10 06:20:57]

Blank lines before }, after namespace { maybe? That seems to be practice. Why do
this namespace thing and not static in blink::?

[yosin_UTC9, 2016/06/10 07:52:28]

Done.
Use static function instead of anonymous namespace, since there is only one
function.

+
 class CustomElementsRegistry::NameIsBeingDefined final {
     STACK_ALLOCATED();
     DISALLOW_IMPLICIT_CONSTRUCTORS(NameIsBeingDefined);
@@ -93,12 +110,8 @@ void CustomElementsRegistry::define(
     if (!builder.checkConstructorIntrinsics())
         return;
 
-    if (!CustomElement::isValidName(name)) {
-        exceptionState.throwDOMException(
-            SyntaxError,
-            "\"" + name + "\" is not a valid custom element name");
+    if (throwIfInvalidName(name, exceptionState))
         return;
-    }
 
     if (m_namesBeingDefined.contains(name)) {
         exceptionState.throwDOMException(
@@ -156,8 +169,12 @@ void CustomElementsRegistry::define(
     for (Element* candidate : candidates)
         CustomElement::enqueueUpgradeReaction(candidate, definition);
 
-    // TODO(dominicc): Implement steps:
-    // 20: when-defined promise processing
+    // 19: when-defined promise processing
+    const auto& entry = m_whenDefinedPromiseMap.find(name);
+    if (entry == m_whenDefinedPromiseMap.end())
+        return;
+    entry->value->resolve();
+    m_whenDefinedPromiseMap.remove(entry);
 }
 
 // https://html.spec.whatwg.org/multipage/scripting.html#dom-customelementsregistry-get
@@ -212,6 +229,26 @@ void CustomElementsRegistry::addCandidate(Element* candidate)
     set->add(candidate);
 }
 
+// https://html.spec.whatwg.org/multipage/scripting.html#dom-customelementsregistry-whendefined
+ScriptPromise CustomElementsRegistry::whenDefined(
+    ScriptState* scriptState,
+    const AtomicString& name,
+    ExceptionState& exceptionState)
+{
+    if (throwIfInvalidName(name, exceptionState))
+        return ScriptPromise();
+    CustomElementDefinition* definition = definitionForName(name);
+    if (definition)
+        return ScriptPromise::castUndefined(scriptState);
+    ScriptPromiseResolver* resolver = m_whenDefinedPromiseMap.get(name);
+    if (resolver)
+        return resolver->promise();
+    ScriptPromiseResolver* newResolver =
+        ScriptPromiseResolver::create(scriptState);
+    m_whenDefinedPromiseMap.add(name, newResolver);
+    return newResolver->promise();
+}
+
 void CustomElementsRegistry::collectCandidates(
     const CustomElementDescriptor& desc,
     HeapVector<Member<Element>>* elements)