Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: Source/bindings/templates/interface.cpp

Issue 618373003: [bindings] partial interfaces should not violate componentization (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed patch conflict Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/bindings/templates/interface.h ('k') | Source/bindings/templates/interface_base.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/templates/interface.cpp
diff --git a/Source/bindings/templates/interface.cpp b/Source/bindings/templates/interface.cpp
index cf39ce723429ee7373fea70c06b9085e81f486c6..7f61b64663b72fe8a5beb8d7d5728fdd34222c3d 100644
--- a/Source/bindings/templates/interface.cpp
+++ b/Source/bindings/templates/interface.cpp
@@ -427,8 +427,8 @@ static void {{cpp_class}}OriginSafeMethodSetterCallback(v8::Local<v8::String> na
{##############################################################################}
-{% from 'methods.cpp' import generate_constructor with context %}
{% block named_constructor %}
+{% from 'methods.cpp' import generate_constructor with context %}
{% if named_constructor %}
{% set to_active_dom_object = '%s::toActiveDOMObject' % v8_class
if is_active_dom_object else '0' %}
@@ -601,8 +601,8 @@ void {{v8_class}}::visitDOMWrapper(ScriptWrappableBase* scriptWrappableBase, con
{##############################################################################}
-{% from 'attributes.cpp' import attribute_configuration with context %}
{% block shadow_attributes %}
+{% from 'attributes.cpp' import attribute_configuration with context %}
{% if interface_name == 'Window' %}
static const V8DOMConfiguration::AttributeConfiguration shadowAttributes[] = {
{% for attribute in attributes if attribute.is_unforgeable and attribute.should_be_exposed_to_script %}
@@ -730,7 +730,14 @@ V8DOMConfiguration::installAttribute({{method.function_template}}, v8::Handle<v8
{% if not is_array_buffer_or_view %}
v8::Handle<v8::FunctionTemplate> {{v8_class}}::domTemplate(v8::Isolate* isolate)
{
- return V8DOMConfiguration::domClassTemplate(isolate, const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), install{{v8_class}}Template);
+ {% if has_partial_interface %}
+ {% set installTemplateFunction = '%s::install%sTemplateFunction' % (v8_class, v8_class) %}
+ ASSERT({{installTemplateFunction}} != {{v8_class}}::install{{v8_class}}Template);
+ {% else %}
+ {% set installTemplateFunction = 'install%sTemplate' % v8_class %}
+ {% endif %}
+{% set installTemplateFunction = '%s::install%sTemplateFunction' % (v8_class, v8_class) if has_partial_interface else 'install%sTemplate' % v8_class %}
+ return V8DOMConfiguration::domClassTemplate(isolate, const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), {{installTemplateFunction}});
}
{% endif %}
@@ -851,6 +858,30 @@ v8::Handle<v8::Object> {{v8_class}}::findInstanceInPrototypeChain(v8::Handle<v8:
{##############################################################################}
+{% block install_conditional_attributes %}
+{% from 'attributes.cpp' import attribute_configuration with context %}
+{% if has_conditional_attributes %}
+void {{v8_class}}::installConditionallyEnabledProperties(v8::Handle<v8::Object> instanceObject, v8::Isolate* isolate)
+{
+ v8::Local<v8::Object> prototypeObject = v8::Local<v8::Object>::Cast(instanceObject->GetPrototype());
+ ExecutionContext* context = toExecutionContext(prototypeObject->CreationContext());
+
+ {% for attribute in attributes if attribute.per_context_enabled_function or attribute.exposed_test %}
+ {% filter per_context_enabled(attribute.per_context_enabled_function) %}
+ {% filter exposed(attribute.exposed_test) %}
+ static const V8DOMConfiguration::AttributeConfiguration attributeConfiguration =\
+ {{attribute_configuration(attribute)}};
+ V8DOMConfiguration::installAttribute(instanceObject, prototypeObject, attributeConfiguration, isolate);
+ {% endfilter %}
+ {% endfilter %}
+ {% endfor %}
+}
+
+{% endif %}
+{% endblock %}
+
+
+{##############################################################################}
{% block to_active_dom_object %}
{% if is_active_dom_object %}
ActiveDOMObject* {{v8_class}}::toActiveDOMObject(v8::Handle<v8::Object> wrapper)
@@ -974,3 +1005,24 @@ v8::Handle<v8::Value> toV8NoInline({{cpp_class}}* impl, v8::Handle<v8::Object> c
}
{% endblock %}
+
+{##############################################################################}
+{% block partial_interface %}
+{% if has_partial_interface %}
+InstallTemplateFunction {{v8_class}}::install{{v8_class}}TemplateFunction = (InstallTemplateFunction)&{{v8_class}}::install{{v8_class}}Template;
+
+void {{v8_class}}::updateWrapperTypeInfo(InstallTemplateFunction installTemplateFunction, InstallConditionallyEnabledMethodsFunction installConditionallyEnabledMethodsFunction)
+{
+ {{v8_class}}::install{{v8_class}}TemplateFunction = installTemplateFunction;
+ if (installConditionallyEnabledMethodsFunction)
+ {{v8_class}}::wrapperTypeInfo.installConditionallyEnabledMethodsFunction = installConditionallyEnabledMethodsFunction;
+}
+
+{% 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 %}
« no previous file with comments | « Source/bindings/templates/interface.h ('k') | Source/bindings/templates/interface_base.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698