Blink-in-JS: Implement internal APIs exposed only to private scripts

Source/bindings/templates/interface.cpp

 {% extends 'interface_base.cpp' %}
 
 
 {##############################################################################}
 {% macro attribute_configuration(attribute) %}
 {% set getter_callback =
        '%sV8Internal::%sAttributeGetterCallback' %
             (cpp_class, attribute.name)
        if not attribute.constructor_type else
        ('%sV8Internal::%sConstructorGetterCallback' %
@@ skipping 11 matching lines @@
        if attribute.is_per_world_bindings and
           (not attribute.is_read_only or attribute.put_forwards) else '0' %}
 {% set wrapper_type_info =
        'const_cast<WrapperTypeInfo*>(&V8%s::wrapperTypeInfo)' %
             attribute.constructor_type
         if attribute.constructor_type else '0' %}
 {% set access_control = 'static_cast<v8::AccessControl>(%s)' %
                         ' | '.join(attribute.access_control_list) %}
 {% set property_attribute = 'static_cast<v8::PropertyAttribute>(%s)' %
                             ' | '.join(attribute.property_attributes) %}
+{% set only_exposed_to_private_script = 'V8DOMConfiguration::OnlyExposedToPrivateScript' if attribute.only_exposed_to_private_script else 'V8DOMConfiguration::ExposedToAllScripts' %}
 {% set on_prototype = '1 /* on prototype */'
        if interface_name == 'Window' and attribute.idl_type == 'EventHandler'
        else '0 /* on instance */' %}
 {% set attribute_configuration_list = [
        '"%s"' % attribute.name,
        getter_callback,
        setter_callback,
        getter_callback_for_main_world,
        setter_callback_for_main_world,
        wrapper_type_info,
        access_control,
        property_attribute,
+       only_exposed_to_private_script,
    ] %}
 {% if not attribute.is_expose_js_accessors %}
 {% set attribute_configuration_list = attribute_configuration_list
                                     + [on_prototype] %}
 {% endif %}
 {{'{'}}{{attribute_configuration_list | join(', ')}}{{'}'}}
 {%- endmacro %}
 
 
 {##############################################################################}
 {% macro method_configuration(method) %}
 {% set method_callback =
    '%sV8Internal::%sMethodCallback' % (cpp_class, method.name) %}
 {% set method_callback_for_main_world =
    '%sV8Internal::%sMethodCallbackForMainWorld' % (cpp_class, method.name)
    if method.is_per_world_bindings else '0' %}
-{"{{method.name}}", {{method_callback}}, {{method_callback_for_main_world}}, {{method.length}}}
+{% set only_exposed_to_private_script = 'V8DOMConfiguration::OnlyExposedToPrivateScript' if method.only_exposed_to_private_script else 'V8DOMConfiguration::ExposedToAllScripts' %}
+{"{{method.name}}", {{method_callback}}, {{method_callback_for_main_world}}, {{method.length}}, {{only_exposed_to_private_script}}}
 {%- endmacro %}
 
 
 {##############################################################################}
 {% block constructor_getter %}
 {% if has_constructor_attributes %}
 static void {{cpp_class}}ConstructorGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     v8::Handle<v8::Value> data = info.Data();
     ASSERT(data->IsExternal());
@@ skipping 649 matching lines @@
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block shadow_attributes %}
 {% if interface_name == 'Window' %}
 static const V8DOMConfiguration::AttributeConfiguration shadowAttributes[] = {
-    {% for attribute in attributes if attribute.is_unforgeable %}
-    {# FIXME: Expose [OnlyExposedToPrivateScript] attributes to window objects of private scripts #}
-    {% if not attribute.only_exposed_to_private_script %}
+    {% for attribute in attributes if attribute.is_unforgeable and attribute.should_be_exposed_to_script %}
     {{attribute_configuration(attribute)}},
-    {% endif %}
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block install_attributes %}
 {% if has_attribute_configuration %}
 static const V8DOMConfiguration::AttributeConfiguration {{v8_class}}Attributes[] = {
     {% for attribute in attributes
        if not (attribute.is_expose_js_accessors or
                attribute.is_static or
                attribute.runtime_enabled_function or
                attribute.per_context_enabled_function or
-               (interface_name == 'Window' and attribute.is_unforgeable)) %}
-    {# FIXME: Expose [OnlyExposedToPrivateScript] attributes to window objects of private scripts #}
-    {% if not attribute.only_exposed_to_private_script %}
+               (interface_name == 'Window' and attribute.is_unforgeable))
+           and attribute.should_be_exposed_to_script %}
     {% filter conditional(attribute.conditional_string) %}
     {{attribute_configuration(attribute)}},
     {% endfilter %}
-    {% endif %}
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block install_accessors %}
 {% if has_accessors %}
 static const V8DOMConfiguration::AccessorConfiguration {{v8_class}}Accessors[] = {
-    {% for attribute in attributes if attribute.is_expose_js_accessors %}
-    {# FIXME: Expose [OnlyExposedToPrivateScript] attributes to window objects of private scripts #}
-    {% if not attribute.only_exposed_to_private_script %}
+    {% for attribute in attributes if attribute.is_expose_js_accessors and attribute.should_be_exposed_to_script %}
     {{attribute_configuration(attribute)}},
-    {% endif %}
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block install_methods %}
 {% if method_configuration_methods %}
 static const V8DOMConfiguration::MethodConfiguration {{v8_class}}Methods[] = {
-    {% for method in method_configuration_methods %}
-    {# FIXME: Expose [OnlyExposedToPrivateScript] methods to window objects of private scripts #}
-    {% if not method.only_exposed_to_private_script %}
+    {% for method in method_configuration_methods if method.should_be_exposed_to_script %}
     {% filter conditional(method.conditional_string) %}
     {{method_configuration(method)}},
     {% endfilter %}
-    {% endif %}
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block initialize_event %}
 {% if has_event_constructor %}
@@ skipping 251 matching lines @@
 {% set setter_callback_for_main_world = '%sForMainWorld' % setter_callback
    if not method.is_read_only else '0' %}
 {% else %}
 {% set getter_callback_for_main_world = '0' %}
 {% set setter_callback_for_main_world = '0' %}
 {% endif %}
 {% set property_attribute =
     'static_cast<v8::PropertyAttribute>(%s)' %
     ' | '.join(method.property_attributes or ['v8::DontDelete']) %}
 static const V8DOMConfiguration::AttributeConfiguration {{method.name}}OriginSafeAttributeConfiguration = {
-    "{{method.name}}", {{getter_callback}}, {{setter_callback}}, {{getter_callback_for_main_world}}, {{setter_callback_for_main_world}}, &{{v8_class}}::wrapperTypeInfo, v8::ALL_CAN_READ, {{property_attribute}}, false
+    "{{method.name}}", {{getter_callback}}, {{setter_callback}}, {{getter_callback_for_main_world}}, {{setter_callback_for_main_world}}, &{{v8_class}}::wrapperTypeInfo, v8::ALL_CAN_READ, {{property_attribute}}, V8DOMConfiguration::ExposedToAllScripts, false,
 };
 V8DOMConfiguration::installAttribute({{method.function_template}}, v8::Handle<v8::ObjectTemplate>(), {{method.name}}OriginSafeAttributeConfiguration, isolate);
 {%- endmacro %}
 
 
 {######################################}
 {% macro install_custom_signature(method) %}
 {% set method_callback = '%sV8Internal::%sMethodCallback' % (cpp_class, method.name) %}
 {% set method_callback_for_main_world = '%sForMainWorld' % method_callback
   if method.is_per_world_bindings else '0' %}
 {% set property_attribute =
   'static_cast<v8::PropertyAttribute>(%s)' % ' | '.join(method.property_attributes)
   if method.property_attributes else 'v8::None' %}
 static const V8DOMConfiguration::MethodConfiguration {{method.name}}MethodConfiguration = {
-    "{{method.name}}", {{method_callback}}, {{method_callback_for_main_world}}, {{method.length}}
+    "{{method.name}}", {{method_callback}}, {{method_callback_for_main_world}}, {{method.length}}, V8DOMConfiguration::ExposedToAllScripts,

[Jens Widell, 2014/07/25 11:09:45]

Should we assert somewhere that this code path isn't triggered for a method with
[OnlyExposeToPrivateScript]?

[haraken, 2014/07/25 13:22:16]

Instead of adding asserts, I just supported [OnlyExposedToPrivateScript] in
these structures as well.

 };
 V8DOMConfiguration::installMethodCustomSignature({{method.function_template}}, {{method.signature}}, {{property_attribute}}, {{method.name}}MethodConfiguration, isolate);
 {%- endmacro %}
 
 
 {######################################}
 {% macro install_constants() %}
 {# Normal (always enabled) constants #}
 static const V8DOMConfiguration::ConstantConfiguration {{v8_class}}Constants[] = {
     {% for constant in constants if not constant.runtime_enabled_function %}
@@ skipping 260 matching lines @@
 {% endif %}
 }
 
 template<>
 v8::Handle<v8::Value> toV8NoInline({{cpp_class}}* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     return toV8(impl, creationContext, isolate);
 }
 
 {% endblock %}