[bindings] Move callback functions from V8FooInternal namespace to V8Foo class

third_party/WebKit/Source/bindings/templates/interface.cpp.tmpl

 {% extends 'interface_base.cpp.tmpl' %}
 
 {% set has_prepare_prototype_and_interface_object =
     unscopables or has_conditional_attributes_on_prototype or
     methods | conditionally_exposed(is_partial) %}
 {% set prepare_prototype_and_interface_object_func =
     '%s::preparePrototypeAndInterfaceObject' % v8_class
     if has_prepare_prototype_and_interface_object
     else 'nullptr' %}
 
@@ skipping 30 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block indexed_property_getter_callback %}
 {% if indexed_property_getter or named_property_getter %}
 {% set getter = indexed_property_getter or named_property_getter %}
-{{exported}}void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) {
+void {{v8_class_or_partial}}::indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) {
   {% if indexed_property_getter %}
 
   {% if getter.is_custom %}
   {{v8_class}}::indexedPropertyGetterCustom(index, info);
   {% else %}
   {{cpp_class}}V8Internal::indexedPropertyGetter(index, info);
   {% endif %}
 
   {% else %}{# otherwise, named property #}
 
@@ skipping 53 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block indexed_property_setter_callback %}
 {% if indexed_property_setter or named_property_setter %}
 {% set setter = indexed_property_setter or named_property_setter %}
-{{exported}}void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
+void {{v8_class_or_partial}}::indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
   {% if setter.is_ce_reactions %}
   CEReactionsScope ceReactionsScope;
   {% endif %}
 
   {% if indexed_property_setter %}
 
   {% if setter.is_custom %}
   {{v8_class}}::indexedPropertySetterCustom(index, v8Value, info);
   {% else %}
   {{cpp_class}}V8Internal::indexedPropertySetter(index, v8Value, info);
@@ skipping 47 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block indexed_property_deleter_callback %}
 {% if indexed_property_deleter or named_property_deleter %}
 {% set deleter = indexed_property_deleter or named_property_deleter %}
-{{exported}}void indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
+void {{v8_class_or_partial}}::indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
   {% if deleter.is_ce_reactions %}
   CEReactionsScope ceReactionsScope;
   {% endif %}
 
   {% if indexed_property_deleter %}
 
   {% if deleter.is_custom %}
   {{v8_class}}::indexedPropertyDeleterCustom(index, info);
   {% else %}
   {{cpp_class}}V8Internal::indexedPropertyDeleter(index, info);
@@ skipping 42 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_getter_callback %}
 {% if named_property_getter %}
 {% set getter = named_property_getter %}
-{{exported}}void namedPropertyGetterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
+void {{v8_class_or_partial}}::namedPropertyGetterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
   if (!name->IsString())
     return;
   const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
 
   {% if getter.is_custom %}
   {{v8_class}}::namedPropertyGetterCustom(propertyName, info);
   {% else %}
   {{cpp_class}}V8Internal::namedPropertyGetter(propertyName, info);
   {% endif %}
 }
@@ skipping 46 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_setter_callback %}
 {% if named_property_setter %}
 {% set setter = named_property_setter %}
-{{exported}}void namedPropertySetterCallback(v8::Local<v8::Name> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
+void {{v8_class_or_partial}}::namedPropertySetterCallback(v8::Local<v8::Name> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
   if (!name->IsString())
     return;
   const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
 
   {% if setter.is_ce_reactions %}
   CEReactionsScope ceReactionsScope;
   {% endif %}
 
   {% if setter.is_custom %}
   {{v8_class}}::namedPropertySetterCustom(propertyName, v8Value, info);
@@ skipping 40 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_deleter_callback %}
 {% if named_property_deleter %}
 {% set deleter = named_property_deleter %}
-{{exported}}void namedPropertyDeleterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
+void {{v8_class_or_partial}}::namedPropertyDeleterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
   if (!name->IsString())
     return;
   const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
 
   {% if deleter.is_ce_reactions %}
   CEReactionsScope ceReactionsScope;
   {% endif %}
 
   {% if deleter.is_custom %}
   {{v8_class}}::namedPropertyDeleterCustom(propertyName, info);
@@ skipping 33 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_query_callback %}
 {% if named_property_getter and named_property_getter.is_enumerable %}
 {% set getter = named_property_getter %}
-{{exported}}void namedPropertyQueryCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Integer>& info) {
+void {{v8_class_or_partial}}::namedPropertyQueryCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Integer>& info) {
   if (!name->IsString())
     return;
   const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
 
   {% if getter.is_custom_property_query %}
   {{v8_class}}::namedPropertyQueryCustom(propertyName, info);
   {% else %}
   {{cpp_class}}V8Internal::namedPropertyQuery(propertyName, info);
   {% endif %}
 }
@@ skipping 19 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_enumerator_callback %}
 {% if named_property_getter and named_property_getter.is_enumerable %}
 {% set getter = named_property_getter %}
-{{exported}}void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info) {
+void {{v8_class_or_partial}}::namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info) {
   {% if getter.is_custom_property_enumerator %}
   {{v8_class}}::namedPropertyEnumeratorCustom(info);
   {% else %}
   {{cpp_class}}V8Internal::namedPropertyEnumerator(info);
   {% endif %}
 }
 
 {% endif %}
 {% endblock %}
 
@@ skipping 13 matching lines @@
   {{cpp_class}}* impl = {{v8_class}}::toImpl(holder);
   v8::String::Utf8Value attributeName(name);
   ExceptionState exceptionState(info.GetIsolate(), ExceptionState::SetterContext, "{{interface_name}}", *attributeName);
   if (!BindingSecurity::shouldAllowAccessTo(currentDOMWindow(info.GetIsolate()), impl, exceptionState)) {
     return;
   }
 
   {# The findInstanceInPrototypeChain() call above only returns a non-empty handle if info.Holder() is an Object. #}
   V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), v8::Local<v8::Object>::Cast(info.Holder()), name.As<v8::String>(), v8Value);
 }
-
-{{exported}}void {{cpp_class}}OriginSafeMethodSetterCallback(v8::Local<v8::Name> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) {
-  {{cpp_class}}V8Internal::{{cpp_class}}OriginSafeMethodSetter(name, v8Value, info);
-}
-
 {% endif %}
 {% endblock %}
 
+{% block origin_safe_method_setter_callback %}
+{% if has_origin_safe_method_setter %}
+void {{v8_class_or_partial}}::{{cpp_class}}OriginSafeMethodSetterCallback(v8::Local<v8::Name> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) {
+  {{cpp_class}}V8Internal::{{cpp_class}}OriginSafeMethodSetter(name, v8Value, info);
+}
+{% endif %}
+{% endblock %}
+
 
 {##############################################################################}
 {% block named_constructor %}
 {% from 'methods.cpp.tmpl' import generate_constructor with context %}
 {% if named_constructor %}
 {% set active_scriptwrappable_inheritance =
     'InheritFromActiveScriptWrappable'
     if active_scriptwrappable else
     'NotInheritFromActiveScriptWrappable' %}
 // Suppress warning: global constructors, because struct WrapperTypeInfo is trivial
@@ skipping 128 matching lines @@
 {% endblock %}
 
 
 {##############################################################################}
 {% macro install_origin_safe_method(method, world_suffix, instance_template, prototype_template) %}
 {% from 'utilities.cpp.tmpl' import property_location %}
 {# TODO(dcheng): Currently, bindings must create a function object for each
    realm as a hack to support the incumbent realm. Clean this up when Blink
    properly supports the incumbent realm. #}
 {% set getter_callback =
-       '%sV8Internal::%sOriginSafeMethodGetterCallback%s' %
-       (cpp_class, method.name, world_suffix) %}
+       '%s::%sOriginSafeMethodGetterCallback%s' %
+       (v8_class_or_partial, method.name, world_suffix) %}
 {% set setter_callback =
-       '{0}V8Internal::{0}OriginSafeMethodSetterCallback'.format(cpp_class)
-       if not method.is_unforgeable else '0' %}
+       '%s::%sOriginSafeMethodSetterCallback' % (v8_class_or_partial, cpp_class)
+       if not method.is_unforgeable else 'nullptr' %}
 {% if method.is_per_world_bindings %}
 {% set getter_callback_for_main_world = '%sForMainWorld' % getter_callback %}
 {% set setter_callback_for_main_world = '%sForMainWorld' % setter_callback
-       if not method.is_unforgeable else '0' %}
+       if not method.is_unforgeable else 'nullptr' %}
 {% else %}
-{% set getter_callback_for_main_world = '0' %}
-{% set setter_callback_for_main_world = '0' %}
+{% set getter_callback_for_main_world = 'nullptr' %}
+{% set setter_callback_for_main_world = 'nullptr' %}
 {% endif %}
 {% set property_attribute =
        'static_cast<v8::PropertyAttribute>(%s)' %
        ' | '.join(method.property_attributes or ['v8::None']) %}
 {% set holder_check = 'V8DOMConfiguration::CheckHolder' %}
 const V8DOMConfiguration::AttributeConfiguration {{method.name}}OriginSafeAttributeConfiguration = {
     "{{method.name}}", {{getter_callback}}, {{setter_callback}}, {{getter_callback_for_main_world}}, {{setter_callback_for_main_world}}, nullptr, &{{v8_class}}::wrapperTypeInfo, {{property_attribute}}, {{property_location(method)}}, {{holder_check}}
 };
 V8DOMConfiguration::installAttribute(isolate, world, {{instance_template}}, {{prototype_template}}, {{method.name}}OriginSafeAttributeConfiguration);
 {%- endmacro %}
 
 
 {##############################################################################}
 {% macro install_indexed_property_handler(target) %}
 {% set indexed_property_getter_callback =
-       '%sV8Internal::indexedPropertyGetterCallback' % cpp_class %}
+       '%s::indexedPropertyGetterCallback' % v8_class_or_partial %}
 {% set indexed_property_setter_callback =
-       '%sV8Internal::indexedPropertySetterCallback' % cpp_class
-       if indexed_property_setter or named_property_setter else '0' %}
-{% set indexed_property_query_callback = '0' %}{# Unused #}
+       '%s::indexedPropertySetterCallback' % v8_class_or_partial
+       if indexed_property_setter or named_property_setter else 'nullptr' %}
+{% set indexed_property_query_callback = 'nullptr' %}{# Unused #}
 {% set indexed_property_deleter_callback =
-       '%sV8Internal::indexedPropertyDeleterCallback' % cpp_class
-       if indexed_property_deleter or named_property_deleter else '0' %}
+       '%s::indexedPropertyDeleterCallback' % v8_class_or_partial
+       if indexed_property_deleter or named_property_deleter else 'nullptr' %}
 {% set indexed_property_enumerator_callback =
        'indexedPropertyEnumerator<%s>' % cpp_class
-       if indexed_property_getter.is_enumerable else '0' %}
+       if indexed_property_getter.is_enumerable else 'nullptr' %}
 {% set property_handler_flags =
        'v8::PropertyHandlerFlags::kNone' %}
 v8::IndexedPropertyHandlerConfiguration indexedPropertyHandlerConfig({{indexed_property_getter_callback}}, {{indexed_property_setter_callback}}, {{indexed_property_query_callback}}, {{indexed_property_deleter_callback}}, {{indexed_property_enumerator_callback}}, v8::Local<v8::Value>(), {{property_handler_flags}});
 {{target}}->SetHandler(indexedPropertyHandlerConfig);
 {%- endmacro %}
 
 
 {##############################################################################}
 {% macro install_named_property_handler(target) %}
 {% set named_property_getter_callback =
-       '%sV8Internal::namedPropertyGetterCallback' % cpp_class %}
+       '%s::namedPropertyGetterCallback' % v8_class_or_partial %}
 {% set named_property_setter_callback =
-       '%sV8Internal::namedPropertySetterCallback' % cpp_class
-       if named_property_setter else '0' %}
+       '%s::namedPropertySetterCallback' % v8_class_or_partial
+       if named_property_setter else 'nullptr' %}
 {% set named_property_query_callback =
-       '%sV8Internal::namedPropertyQueryCallback' % cpp_class
-       if named_property_getter.is_enumerable else '0' %}
+       '%s::namedPropertyQueryCallback' % v8_class_or_partial
+       if named_property_getter.is_enumerable else 'nullptr' %}
 {% set named_property_deleter_callback =
-       '%sV8Internal::namedPropertyDeleterCallback' % cpp_class
-       if named_property_deleter else '0' %}
+       '%s::namedPropertyDeleterCallback' % v8_class_or_partial
+       if named_property_deleter else 'nullptr' %}
 {% set named_property_enumerator_callback =
-       '%sV8Internal::namedPropertyEnumeratorCallback' % cpp_class
-       if named_property_getter.is_enumerable else '0' %}
+       '%s::namedPropertyEnumeratorCallback' % v8_class_or_partial
+       if named_property_getter.is_enumerable else 'nullptr' %}
 {% set property_handler_flags_list =
        ['int(v8::PropertyHandlerFlags::kOnlyInterceptStrings)'] %}
 {% if not is_override_builtins %}
 {% set property_handler_flags_list =
        property_handler_flags_list + ['int(v8::PropertyHandlerFlags::kNonMasking)'] %}
 {% endif %}
 {% set property_handler_flags =
        'static_cast<v8::PropertyHandlerFlags>(%s)' %
            ' | '.join(property_handler_flags_list) %}
 v8::NamedPropertyHandlerConfiguration namedPropertyHandlerConfig({{named_property_getter_callback}}, {{named_property_setter_callback}}, {{named_property_query_callback}}, {{named_property_deleter_callback}}, {{named_property_enumerator_callback}}, v8::Local<v8::Value>(), {{property_handler_flags}});
@@ skipping 217 matching lines @@
 }
 
 {% for method in methods if method.overloads and method.overloads.has_partial_overloads %}
 void {{v8_class}}::register{{method.name | blink_capitalize}}MethodForPartialInterface(void (*method)(const v8::FunctionCallbackInfo<v8::Value>&)) {
   {{cpp_class}}V8Internal::{{method.name}}MethodForPartialInterface = method;
 }
 
 {% endfor %}
 {% endif %}
 {% endblock %}