Support combination of [OriginTrialEnabled] and [SecureContext]

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

 {% filter format_blink_cpp_source_code %}
 
 {% include 'copyright_block.txt' %}
 #include "{{v8_class_or_partial}}.h"
 
 {% for filename in cpp_includes if filename != '%s.h' % cpp_class_or_partial %}
 #include "{{filename}}"
 {% endfor %}
 
 namespace blink {
@@ skipping 686 matching lines @@
         with context %}
 {% from 'constants.cpp.tmpl' import constant_configuration with context %}
 {% from 'methods.cpp.tmpl' import method_configuration with context %}
 {% for feature in origin_trial_features %}
 void {{v8_class_or_partial}}::install{{feature.name}}(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::Object> instance, v8::Local<v8::Object> prototype, v8::Local<v8::Function> interface) {
   {% if feature.attributes or feature.methods %}
   v8::Local<v8::FunctionTemplate> interfaceTemplate = {{v8_class}}::wrapperTypeInfo.domTemplate(isolate, world);
   v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate);
   ALLOW_UNUSED_LOCAL(signature);
   {% endif %}
+  {% if feature.needs_secure_context %}
+  ExecutionContext* executionContext = ToExecutionContext(isolate->GetCurrentContext());
+  bool isSecureContext = (executionContext && executionContext->IsSecureContext());
+  {% endif %}{# needs secure context #}
   {# Origin-Trial-enabled attributes #}
   {% for attribute in feature.attributes %}
+  {% filter secure_context_cached(attribute.secure_context_test) %}
   {% if attribute.is_data_type_property %}
   static const V8DOMConfiguration::AttributeConfiguration attribute{{attribute.name}}Configuration[] = {
     {{attribute_configuration(attribute) | indent(2)}}
   };
   for (const auto& attributeConfig : attribute{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAttribute(isolate, world, instance, prototype, attributeConfig);
   {% else %}
   static const V8DOMConfiguration::AccessorConfiguration accessor{{attribute.name}}Configuration[] = {
     {{accessor_configuration(attribute) | indent(2)}}
   };
   for (const auto& accessorConfig : accessor{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAccessor(isolate, world, instance, prototype, interface, signature, accessorConfig);
   {% endif %}
+  {% endfilter %}{# secure_context #}

[Yuki, 2017/05/12 09:10:05]

nit: secure_context_cached

[chasej, 2017/05/16 02:21:39]

Removed secure_context_cached (as suggested above), so no change needed here.

   {% endfor %}
   {# Origin-Trial-enabled constants #}
   {% for constant in feature.constants %}
   {% set constant_name = constant.name.title().replace('_', '') %}
   const V8DOMConfiguration::ConstantConfiguration constant{{constant_name}}Configuration = {{constant_configuration(constant)}};
   V8DOMConfiguration::InstallConstant(isolate, interface, prototype, constant{{constant_name}}Configuration);
   {% endfor %}
   {# Origin-Trial-enabled methods (no overloads) #}
   {% for method in feature.methods %}
+  {% filter secure_context_cached(method.secure_context_test) %}
   {% set method_name = method.name.title().replace('_', '') %}
   static const V8DOMConfiguration::MethodConfiguration method{{method_name}}Configuration[] = {
     {{method_configuration(method) | indent(2)}}
   };
   for (const auto& methodConfig : method{{method_name}}Configuration)
     V8DOMConfiguration::InstallMethod(isolate, world, instance, prototype, interface, signature, methodConfig);
+  {% endfilter %}{# secure_context #}

[Yuki, 2017/05/12 09:10:05]

nit: secure_context_cached

[chasej, 2017/05/16 02:21:39]

Removed secure_context_cached (as suggested above), so no change needed here.

   {% endfor %}
 }
 
 void {{v8_class_or_partial}}::install{{feature.name}}(ScriptState* scriptState, v8::Local<v8::Object> instance) {
   V8PerContextData* perContextData = V8PerContextData::From(scriptState->GetContext());
   v8::Local<v8::Object> prototype = perContextData->PrototypeForType(&{{v8_class}}::wrapperTypeInfo);
   v8::Local<v8::Function> interface = perContextData->ConstructorForType(&{{v8_class}}::wrapperTypeInfo);
   ALLOW_UNUSED_LOCAL(interface);
   install{{feature.name}}(scriptState->GetIsolate(), scriptState->World(), instance, prototype, interface);
 }
@@ skipping 17 matching lines @@
 {% block prepare_prototype_and_interface_object %}
 {% from 'attributes.cpp.tmpl' import install_conditionally_enabled_attributes_on_prototype with context %}
 {% from 'methods.cpp.tmpl' import install_conditionally_enabled_methods with context %}
 {% if prepare_prototype_and_interface_object_func %}
 void {{v8_class_or_partial}}::preparePrototypeAndInterfaceObject(v8::Local<v8::Context> context, const DOMWrapperWorld& world, v8::Local<v8::Object> prototypeObject, v8::Local<v8::Function> interfaceObject, v8::Local<v8::FunctionTemplate> interfaceTemplate) {
   {% if is_partial %}
   {{v8_class}}::preparePrototypeAndInterfaceObject(context, world, prototypeObject, interfaceObject, interfaceTemplate);
   {% endif %}
 
   v8::Isolate* isolate = context->GetIsolate();
-  {% if has_conditional_attributes_on_prototype or methods | conditionally_exposed(is_partial) %}
+  {% if has_conditional_attributes_on_prototype or has_conditional_methods %}
   v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate);
   ExecutionContext* executionContext = ToExecutionContext(context);
   DCHECK(executionContext);
   {% endif %}
 
 {% if unscopables %}
   v8::Local<v8::Name> unscopablesSymbol(v8::Symbol::GetUnscopables(isolate));
   v8::Local<v8::Object> unscopables;
   if (V8CallBoolean(prototypeObject->HasOwnProperty(context, unscopablesSymbol)))
     unscopables = prototypeObject->Get(context, unscopablesSymbol).ToLocalChecked().As<v8::Object>();
   else
     unscopables = v8::Object::New(isolate);
   {% for name, runtime_enabled_feature_name in unscopables %}
   {% filter runtime_enabled(runtime_enabled_feature_name) %}
   unscopables->CreateDataProperty(context, V8AtomicString(isolate, "{{name}}"), v8::True(isolate)).FromJust();
   {% endfilter %}
   {% endfor %}
   prototypeObject->CreateDataProperty(context, unscopablesSymbol, unscopables).FromJust();
 {% endif %}{# unscopables #}
 {% if has_conditional_attributes_on_prototype %}
   {{install_conditionally_enabled_attributes_on_prototype() | indent(2)}}
 {% endif %}
-{% if methods | conditionally_exposed(is_partial) %}
+{% if has_conditional_methods %}
   {{install_conditionally_enabled_methods() | indent(2)}}
 {% endif %}
 }
 {% endif %}
 
 {% endblock %}
 {##############################################################################}
 {% block partial_interface %}{% endblock %}
 }  // namespace blink
 
 {% endfilter %}{# format_blink_cpp_source_code #}