bindings: Refactors BindingSecurity::shouldAllowAccessToXXX.

third_party/WebKit/Source/bindings/templates/attributes.cpp

 {% from 'conversions.cpp' import declare_enum_validation_variable, v8_value_to_local_cpp_value %}
 
 
 {##############################################################################}
 {% macro attribute_getter(attribute, world_suffix) %}
 {% filter conditional(attribute.conditional_string) %}
 static void {{attribute.name}}AttributeGetter{{world_suffix}}(
 {%- if attribute.is_data_type_property %}
 const v8::PropertyCallbackInfo<v8::Value>& info
 {%- else %}
@@ skipping 59 matching lines @@
     {% elif attribute.cpp_value_original %}
     {{attribute.cpp_type}} {{attribute.cpp_value}}({{attribute.cpp_value_original}});
     {% endif %}
     {# Checks #}
     {% if attribute.is_getter_raises_exception %}
     if (UNLIKELY(exceptionState.throwIfNeeded()))
         return;
     {% endif %}
     {# Security checks #}
     {% if not attribute.is_data_type_property %}
-    {% if attribute.is_check_security_for_window %}
-    if (LocalDOMWindow* window = impl->toDOMWindow()) {
-        if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), window->frame(), exceptionState)) {
-            v8SetReturnValueNull(info);
-            exceptionState.throwIfNeeded();
-            return;
-        }
-        if (!window->document())

[haraken, 2015/11/16 11:34:21]

Is it okay to remove this check?

[Yuki, 2015/11/20 12:27:52]

Yes, because shouldAllowAccessToFrame always fails if the Window does not have a
Document.  This line is dead code.

-            return;
-    }
-    {% elif attribute.is_check_security_for_frame %}
-    if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), impl->frame(), exceptionState)) {
+    {% if attribute.is_check_security_for_window or
+          attribute.is_check_security_for_frame or
+          attribute.is_check_security_for_node %}
+    if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), {{attribute.cpp_value if attribute.is_check_security_for_node else 'impl'}}, exceptionState)) {
         v8SetReturnValueNull(info);
         exceptionState.throwIfNeeded();
         return;
     }
     {% endif %}
     {% endif %}
-    {% if attribute.is_check_security_for_node %}
-    if (!BindingSecurity::shouldAllowAccessToNode(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), {{attribute.cpp_value}}, exceptionState)) {
-        v8SetReturnValueNull(info);
-        exceptionState.throwIfNeeded();
-        return;
-    }
-    {% endif %}
     {% if attribute.reflect_only %}
     {{release_only_check(attribute.reflect_only, attribute.reflect_missing,
                          attribute.reflect_invalid, attribute.reflect_empty,
                          attribute.cpp_value)
       | indent}}
     {% endif %}
     {% if attribute.is_explicit_nullable %}
     if (isNull) {
         v8SetReturnValueNull(info);
         return;
@@ skipping 176 matching lines @@
     {{cpp_class}}* impl = {{v8_class}}::toImpl(holder);
     {% endif %}
     {% if attribute.idl_type == 'EventHandler' and interface_name == 'Window' %}
     if (!impl->document())
         return;
     {% endif %}
     {# Security checks #}
     {% if not attribute.is_replaceable and
           not attribute.constructor_type %}
     {% if not attribute.is_data_type_property %}
-    {% if attribute.is_check_security_for_window %}
-    if (LocalDOMWindow* window = impl->toDOMWindow()) {
-        if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), window->frame(), exceptionState)) {
-            v8SetReturnValue(info, v8Value);
-            exceptionState.throwIfNeeded();
-            return;
-        }
-        if (!window->document())

[haraken, 2015/11/16 11:34:21]

Ditto.

[Yuki, 2015/11/20 12:27:52]

Ditto.

-            return;
-    }
-    {% elif attribute.is_check_security_for_frame %}
-    if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), impl->frame(), exceptionState)) {
+    {% if attribute.is_check_security_for_window or
+          attribute.is_check_security_for_frame or
+          attribute.is_check_security_for_node %}
+    if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), {{attribute.cpp_value if attribute.is_check_security_for_node else 'impl'}}, exceptionState)) {
         v8SetReturnValue(info, v8Value);
         exceptionState.throwIfNeeded();
         return;
     }
     {% endif %}
     {% endif %}
-    {% if attribute.is_check_security_for_node %}
-    if (!BindingSecurity::shouldAllowAccessToNode(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), {{attribute.cpp_value}}, exceptionState)) {
-        v8SetReturnValue(info, v8Value);
-        exceptionState.throwIfNeeded();
-        return;
-    }
-    {% endif %}
     {% endif %}{# not attribute.is_replaceable and
                   not attribute.constructor_type #}
     {# Convert JS value to C++ value #}
     {% if attribute.idl_type != 'EventHandler' %}
     {% if v8_value_to_local_cpp_value(attribute) %}
     {{v8_value_to_local_cpp_value(attribute) | indent}}
     {% endif %}
     {% elif not is_node %}{# EventHandler hack #}
     moveEventListenerToNewWrapper(info.GetIsolate(), holder, {{attribute.event_handler_getter_expression}}, v8Value, {{v8_class}}::eventListenerCacheIndex);
     {% endif %}
@@ skipping 202 matching lines @@
        setter_callback_for_main_world,
        wrapper_type_info,
        access_control,
        property_attribute,
        only_exposed_to_private_script,
        property_location(attribute),
        holder_check,
    ] %}
 {{'{'}}{{attribute_configuration_list | join(', ')}}{{'}'}}
 {%- endmacro %}