CustomElements: adopt node

third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp

Index: third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp
index 49a31397f4aafb2e8cecb022af5a766142d7620b..ca8a47d65764f96609a336458e82004202a7c6c8 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinition.cpp
@@ -107,6 +107,7 @@ ScriptCustomElementDefinition* ScriptCustomElementDefinition::create(
     const v8::Local<v8::Object>& prototype,
     const v8::Local<v8::Function>& connectedCallback,
     const v8::Local<v8::Function>& disconnectedCallback,
+    const v8::Local<v8::Function>& adoptedCallback,
     const v8::Local<v8::Function>& attributeChangedCallback,
     const HashSet<AtomicString>& observedAttributes)
 {
@@ -118,6 +119,7 @@ ScriptCustomElementDefinition* ScriptCustomElementDefinition::create(
             prototype,
             connectedCallback,
             disconnectedCallback,
+            adoptedCallback,
             attributeChangedCallback,
             observedAttributes);
 
@@ -131,11 +133,12 @@ ScriptCustomElementDefinition* ScriptCustomElementDefinition::create(
 
     // We add the prototype and callbacks here to keep them alive. We use the
     // name as the key because it is unique per-registry.
-    v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), 4);
+    v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), 5);
     keepAlive(array, 0, prototype, definition->m_prototype, scriptState);
     keepAlive(array, 1, connectedCallback, definition->m_connectedCallback, scriptState);
     keepAlive(array, 2, disconnectedCallback, definition->m_disconnectedCallback, scriptState);
     keepAlive(array, 3, attributeChangedCallback, definition->m_attributeChangedCallback, scriptState);
+    keepAlive(array, 4, adoptedCallback, definition->m_adoptedCallback, scriptState);

[dominicc (has gone to gerrit), 2016/08/03 07:56:56]

Not important but might be nice to put these in a consistent order to above,
which is consistent with the spec, etc. Needless variation makes people wonder
if there's a reason behind it.

     v8CallOrCrash(map->Set(scriptState->context(), nameValue, array));
 
     return definition;
@@ -148,6 +151,7 @@ ScriptCustomElementDefinition::ScriptCustomElementDefinition(
     const v8::Local<v8::Object>& prototype,
     const v8::Local<v8::Function>& connectedCallback,
     const v8::Local<v8::Function>& disconnectedCallback,
+    const v8::Local<v8::Function>& adoptedCallback,
     const v8::Local<v8::Function>& attributeChangedCallback,
     const HashSet<AtomicString>& observedAttributes)
     : CustomElementDefinition(descriptor, observedAttributes)
@@ -231,11 +235,10 @@ bool ScriptCustomElementDefinition::runConstructor(Element* element)
     if (tryCatch.HasCaught())
         return false;
 
-    // To report InvalidStateError Exception, when the constructor returns some differnt object
+    // To report InvalidStateError Exception, when the constructor returns some different object
     if (result != element) {
         const String& message = "custom element constructors must call super() first and must "
             "not return a different object";
-
         std::unique_ptr<SourceLocation> location = SourceLocation::fromFunction(constructor().As<v8::Function>());
         v8::Local<v8::Value> exception =  V8ThrowException::createDOMException(
             m_scriptState->isolate(),
@@ -303,6 +306,11 @@ bool ScriptCustomElementDefinition::hasDisconnectedCallback() const
     return !m_disconnectedCallback.isEmpty();
 }
 
+bool ScriptCustomElementDefinition::hasAdoptedCallback() const
+{
+    return !m_adoptedCallback.isEmpty();
+}
+
 void ScriptCustomElementDefinition::runCallback(
     v8::Local<v8::Function> callback,
     Element* element, int argc, v8::Local<v8::Value> argv[])
@@ -344,6 +352,15 @@ void ScriptCustomElementDefinition::runDisconnectedCallback(Element* element)
     runCallback(m_disconnectedCallback.newLocal(isolate), element);
 }
 
+void ScriptCustomElementDefinition::runAdoptedCallback(Element* element)
+{
+    if (!m_scriptState->contextIsValid())
+        return;
+    ScriptState::Scope scope(m_scriptState.get());
+    v8::Isolate* isolate = m_scriptState->isolate();
+    runCallback(m_adoptedCallback.newLocal(isolate), element);
+}
+
 void ScriptCustomElementDefinition::runAttributeChangedCallback(
     Element* element, const QualifiedName& name,
     const AtomicString& oldValue, const AtomicString& newValue)