Add callbacks to ScriptCustomElementDefinition

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

Index: third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinitionBuilder.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinitionBuilder.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinitionBuilder.cpp
index 39da9922a20331c868b3889186b2f20796ec9a0a..023099adac36ad7963f18279216d23057f571020 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinitionBuilder.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptCustomElementDefinitionBuilder.cpp
@@ -60,17 +60,21 @@ bool ScriptCustomElementDefinitionBuilder::checkConstructorNotRegistered()
     return true;
 }
 
-bool ScriptCustomElementDefinitionBuilder::checkPrototype()
+bool ScriptCustomElementDefinitionBuilder::getValue(
+    const v8::Local<v8::Object>& object, const char* name,
+    v8::Local<v8::Value>& value) const
 {
     v8::Isolate* isolate = m_scriptState->isolate();
     v8::Local<v8::Context> context = m_scriptState->context();
-    v8::Local<v8::String> prototypeString =
-        v8AtomicString(isolate, "prototype");
+    v8::Local<v8::String> nameString = v8AtomicString(isolate, name);
+    return v8Call(object->Get(context, nameString), value);
+}
+
+bool ScriptCustomElementDefinitionBuilder::checkPrototype()
+{
     v8::Local<v8::Value> prototypeValue;
-    if (!v8Call(
-        m_constructor->Get(context, prototypeString), prototypeValue)) {
+    if (!getValue(m_constructor, "prototype", prototypeValue))
         return false;
-    }
     if (!prototypeValue->IsObject()) {
         m_exceptionState.throwTypeError(
             "constructor prototype is not an object");
@@ -82,6 +86,46 @@ bool ScriptCustomElementDefinitionBuilder::checkPrototype()
     return true;
 }
 
+bool ScriptCustomElementDefinitionBuilder::getCallable(const char* name,
+    v8::Local<v8::Object>& callback) const
+{
+    v8::Local<v8::Value> value;
+    if (!getValue(m_prototype, name, value))
+        return false;
+    if (value->IsUndefined())
+        return true;
+    if (!value->IsObject()) {
+        m_exceptionState.throwTypeError(
+            String::format("\"%s\" is not an object", name));
+        return false;
+    }
+    callback = value.As<v8::Object>();
+    if (!callback->IsCallable()) {
+        m_exceptionState.throwTypeError(
+            String::format("\"%s\" is not callable", name));
+        return false;
+    }
+    return true;
+}
+
+bool ScriptCustomElementDefinitionBuilder::cacheProperties()
+{
+    v8::Local<v8::Value> observedAttributesValue;
+    if (!getValue(m_constructor, "observedAttributes", observedAttributesValue))

[yosin_UTC9, 2016/06/01 06:33:33]

Can we have const char* for these bar string literals to avoid typo?

[kojii, 2016/06/01 07:19:27]

Done.

+        return false;
+    if (!observedAttributesValue->IsUndefined()) {
+        m_observedAttributes = toImplArray<Vector<AtomicString>>(
+            observedAttributesValue, 0, m_scriptState->isolate(),
+            m_exceptionState);
+        if (m_exceptionState.hadException())
+            return false;
+    }
+
+    return getCallable("connectedCallback", m_connectedCallback)
+        && getCallable("disconnectedCallback", m_disconnectedCallback)
+        && getCallable("attributeChangedCallback", m_attributeChangedCallback);
+}
+
 CustomElementDefinition* ScriptCustomElementDefinitionBuilder::build(
     const CustomElementDescriptor& descriptor)
 {
@@ -90,7 +134,11 @@ CustomElementDefinition* ScriptCustomElementDefinitionBuilder::build(
         m_registry,
         descriptor,
         m_constructor,
-        m_prototype);
+        m_prototype,
+        m_connectedCallback,
+        m_disconnectedCallback,
+        m_attributeChangedCallback,
+        m_observedAttributes);
 }
 
 } // namespace blink