Commit 27b0bb30 authored by Jeremy Roman's avatar Jeremy Roman Committed by Commit Bot

Remove outer V0CustomElementProcessingStack::CallbackDeliveryScope from attribute setter callbacks.

These callbacks would already be delivered by the similar scope inside the attribute
implementation. Methods already have only the inner scope.

Change-Id: I72bceec4d883d0dba5e93b2ec19156d3c88590e1
Reviewed-on: https://chromium-review.googlesource.com/662220Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501200}
parent 9c36199b
...@@ -377,9 +377,7 @@ v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info ...@@ -377,9 +377,7 @@ v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info
if (!result) if (!result)
return; return;
{% else %}{# attribute.is_put_forwards #} {% else %}{# attribute.is_put_forwards #}
{% if attribute.is_custom_element_callbacks or {% if attribute.is_custom_element_callbacks or attribute.is_reflect %}
(attribute.is_reflect and not (attribute.idl_type == 'DOMString' and is_node)) %}
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope; V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
{% endif %} {% endif %}
...@@ -497,10 +495,6 @@ const v8::FunctionCallbackInfo<v8::Value>& info ...@@ -497,10 +495,6 @@ const v8::FunctionCallbackInfo<v8::Value>& info
CEReactionsScope ceReactionsScope; CEReactionsScope ceReactionsScope;
{% endif %} {% endif %}
{% if attribute.is_custom_element_callbacks or attribute.is_reflect %}
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
{% endif %}
{% if attribute.has_custom_setter %} {% if attribute.has_custom_setter %}
{{v8_class}}::{{attribute.name}}AttributeSetterCustom(v8Value, info); {{v8_class}}::{{attribute.name}}AttributeSetterCustom(v8Value, info);
{% elif attribute.has_cross_origin_setter %} {% elif attribute.has_cross_origin_setter %}
......
...@@ -85,7 +85,6 @@ static void typeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Function ...@@ -85,7 +85,6 @@ static void typeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Function
SVGTestInterface* impl = V8SVGTestInterface::ToImpl(holder); SVGTestInterface* impl = V8SVGTestInterface::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope; V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set. // Prepare the value to be set.
...@@ -109,8 +108,6 @@ void V8SVGTestInterface::typeAttributeSetterCallback(const v8::FunctionCallbackI ...@@ -109,8 +108,6 @@ void V8SVGTestInterface::typeAttributeSetterCallback(const v8::FunctionCallbackI
v8::Local<v8::Value> v8Value = info[0]; v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
SVGTestInterfaceV8Internal::typeAttributeSetter(v8Value, info); SVGTestInterfaceV8Internal::typeAttributeSetter(v8Value, info);
} }
......
...@@ -186,6 +186,8 @@ static void reflectStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, ...@@ -186,6 +186,8 @@ static void reflectStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
TestInterfaceNode* impl = V8TestInterfaceNode::ToImpl(holder); TestInterfaceNode* impl = V8TestInterfaceNode::ToImpl(holder);
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set. // Prepare the value to be set.
V8StringResource<> cppValue = v8Value; V8StringResource<> cppValue = v8Value;
if (!cppValue.Prepare()) if (!cppValue.Prepare())
...@@ -211,6 +213,8 @@ static void reflectUrlStringAttributeAttributeSetter(v8::Local<v8::Value> v8Valu ...@@ -211,6 +213,8 @@ static void reflectUrlStringAttributeAttributeSetter(v8::Local<v8::Value> v8Valu
TestInterfaceNode* impl = V8TestInterfaceNode::ToImpl(holder); TestInterfaceNode* impl = V8TestInterfaceNode::ToImpl(holder);
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set. // Prepare the value to be set.
V8StringResource<> cppValue = v8Value; V8StringResource<> cppValue = v8Value;
if (!cppValue.Prepare()) if (!cppValue.Prepare())
...@@ -356,8 +360,6 @@ void V8TestInterfaceNode::reflectStringAttributeAttributeSetterCallback(const v8 ...@@ -356,8 +360,6 @@ void V8TestInterfaceNode::reflectStringAttributeAttributeSetterCallback(const v8
v8::Local<v8::Value> v8Value = info[0]; v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestInterfaceNodeV8Internal::reflectStringAttributeAttributeSetter(v8Value, info); TestInterfaceNodeV8Internal::reflectStringAttributeAttributeSetter(v8Value, info);
} }
...@@ -372,8 +374,6 @@ void V8TestInterfaceNode::reflectUrlStringAttributeAttributeSetterCallback(const ...@@ -372,8 +374,6 @@ void V8TestInterfaceNode::reflectUrlStringAttributeAttributeSetterCallback(const
v8::Local<v8::Value> v8Value = info[0]; v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestInterfaceNodeV8Internal::reflectUrlStringAttributeAttributeSetter(v8Value, info); TestInterfaceNodeV8Internal::reflectUrlStringAttributeAttributeSetter(v8Value, info);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment