Skip to content

GitLab

T
tangled
Commit 27b0bb30 authored by Jeremy Roman's avatar Jeremy Roman Committed by Commit Bot
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 71 deletions
third_party/WebKit/Source/bindings/templates/attributes.cpp.tmpl
View file @ 27b0bb30
......@@ -377,9 +377,7 @@ v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info
if (!result)
return;
{% else %}{# attribute.is_put_forwards #}
{% if attribute.is_custom_element_callbacks or
(attribute.is_reflect and not (attribute.idl_type == 'DOMString' and is_node)) %}
// Skip on compact node DOMString getters.
{% if attribute.is_custom_element_callbacks or attribute.is_reflect %}
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
{% endif %}
......@@ -497,10 +495,6 @@ const v8::FunctionCallbackInfo<v8::Value>& info
CEReactionsScope ceReactionsScope;
{% endif %}
{% if attribute.is_custom_element_callbacks or attribute.is_reflect %}
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
{% endif %}
{% if attribute.has_custom_setter %}
{{v8_class}}::{{attribute.name}}AttributeSetterCustom(v8Value, info);
{% elif attribute.has_cross_origin_setter %}
......
third_party/WebKit/Source/bindings/tests/results/core/V8SVGTestInterface.cpp
View file @ 27b0bb30
......@@ -85,7 +85,6 @@ static void typeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Function
SVGTestInterface* impl = V8SVGTestInterface::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -109,8 +108,6 @@ void V8SVGTestInterface::typeAttributeSetterCallback(const v8::FunctionCallbackI
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
SVGTestInterfaceV8Internal::typeAttributeSetter(v8Value, info);
}
......
third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNode.cpp
View file @ 27b0bb30
......@@ -186,6 +186,8 @@ static void reflectStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
TestInterfaceNode* impl = V8TestInterfaceNode::ToImpl(holder);
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
V8StringResource<> cppValue = v8Value;
if (!cppValue.Prepare())
......@@ -211,6 +213,8 @@ static void reflectUrlStringAttributeAttributeSetter(v8::Local<v8::Value> v8Valu
TestInterfaceNode* impl = V8TestInterfaceNode::ToImpl(holder);
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
V8StringResource<> cppValue = v8Value;
if (!cppValue.Prepare())
......@@ -356,8 +360,6 @@ void V8TestInterfaceNode::reflectStringAttributeAttributeSetterCallback(const v8
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestInterfaceNodeV8Internal::reflectStringAttributeAttributeSetter(v8Value, info);
}
......@@ -372,8 +374,6 @@ void V8TestInterfaceNode::reflectUrlStringAttributeAttributeSetterCallback(const
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestInterfaceNodeV8Internal::reflectUrlStringAttributeAttributeSetter(v8Value, info);
}
......
third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
View file @ 27b0bb30
......@@ -3121,7 +3121,6 @@ static void reflectTestInterfaceAttributeAttributeSetter(v8::Local<v8::Value> v8
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "reflectTestInterfaceAttribute");
......@@ -3155,7 +3154,6 @@ static void reflectReflectedNameAttributeTestAttributeAttributeSetter(v8::Local<
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "reflectReflectedNameAttributeTestAttribute");
......@@ -3189,7 +3187,6 @@ static void reflectBooleanAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "reflectBooleanAttribute");
......@@ -3219,7 +3216,6 @@ static void reflectLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, co
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "reflectLongAttribute");
......@@ -3249,7 +3245,6 @@ static void reflectUnsignedShortAttributeAttributeSetter(v8::Local<v8::Value> v8
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "reflectUnsignedShortAttribute");
......@@ -3279,7 +3274,6 @@ static void reflectUnsignedLongAttributeAttributeSetter(v8::Local<v8::Value> v8V
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
ExceptionState exceptionState(isolate, ExceptionState::kSetterContext, "TestObject", "reflectUnsignedLongAttribute");
......@@ -3309,7 +3303,6 @@ static void idAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCa
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3337,7 +3330,6 @@ static void nameAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Function
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3365,7 +3357,6 @@ static void classAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Functio
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3393,7 +3384,6 @@ static void reflectedIdAttributeSetter(v8::Local<v8::Value> v8Value, const v8::F
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3421,7 +3411,6 @@ static void reflectedNameAttributeSetter(v8::Local<v8::Value> v8Value, const v8:
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3449,7 +3438,6 @@ static void reflectedClassAttributeSetter(v8::Local<v8::Value> v8Value, const v8
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3487,7 +3475,6 @@ static void limitedToOnlyOneAttributeAttributeSetter(v8::Local<v8::Value> v8Valu
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3529,7 +3516,6 @@ static void limitedToOnlyAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3569,7 +3555,6 @@ static void limitedToOnlyOtherAttributeAttributeSetter(v8::Local<v8::Value> v8Va
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3609,7 +3594,6 @@ static void limitedWithMissingDefaultAttributeAttributeSetter(v8::Local<v8::Valu
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -3651,7 +3635,6 @@ static void limitedWithInvalidMissingDefaultAttributeAttributeSetter(v8::Local<v
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -4016,7 +3999,6 @@ static void urlStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, cons
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -4044,7 +4026,6 @@ static void urlStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, cons
TestObject* impl = V8TestObject::ToImpl(holder);
// Skip on compact node DOMString getters.
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
// Prepare the value to be set.
......@@ -10990,8 +10971,6 @@ void V8TestObject::reflectTestInterfaceAttributeAttributeSetterCallback(const v8
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectTestInterfaceAttributeAttributeSetter(v8Value, info);
}
......@@ -11006,8 +10985,6 @@ void V8TestObject::reflectReflectedNameAttributeTestAttributeAttributeSetterCall
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectReflectedNameAttributeTestAttributeAttributeSetter(v8Value, info);
}
......@@ -11022,8 +10999,6 @@ void V8TestObject::reflectBooleanAttributeAttributeSetterCallback(const v8::Func
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectBooleanAttributeAttributeSetter(v8Value, info);
}
......@@ -11038,8 +11013,6 @@ void V8TestObject::reflectLongAttributeAttributeSetterCallback(const v8::Functio
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectLongAttributeAttributeSetter(v8Value, info);
}
......@@ -11054,8 +11027,6 @@ void V8TestObject::reflectUnsignedShortAttributeAttributeSetterCallback(const v8
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectUnsignedShortAttributeAttributeSetter(v8Value, info);
}
......@@ -11070,8 +11041,6 @@ void V8TestObject::reflectUnsignedLongAttributeAttributeSetterCallback(const v8:
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectUnsignedLongAttributeAttributeSetter(v8Value, info);
}
......@@ -11086,8 +11055,6 @@ void V8TestObject::idAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::idAttributeSetter(v8Value, info);
}
......@@ -11102,8 +11069,6 @@ void V8TestObject::nameAttributeSetterCallback(const v8::FunctionCallbackInfo<v8
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::nameAttributeSetter(v8Value, info);
}
......@@ -11118,8 +11083,6 @@ void V8TestObject::classAttributeSetterCallback(const v8::FunctionCallbackInfo<v
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::classAttributeSetter(v8Value, info);
}
......@@ -11134,8 +11097,6 @@ void V8TestObject::reflectedIdAttributeSetterCallback(const v8::FunctionCallback
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectedIdAttributeSetter(v8Value, info);
}
......@@ -11150,8 +11111,6 @@ void V8TestObject::reflectedNameAttributeSetterCallback(const v8::FunctionCallba
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectedNameAttributeSetter(v8Value, info);
}
......@@ -11166,8 +11125,6 @@ void V8TestObject::reflectedClassAttributeSetterCallback(const v8::FunctionCallb
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::reflectedClassAttributeSetter(v8Value, info);
}
......@@ -11182,8 +11139,6 @@ void V8TestObject::limitedToOnlyOneAttributeAttributeSetterCallback(const v8::Fu
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::limitedToOnlyOneAttributeAttributeSetter(v8Value, info);
}
......@@ -11198,8 +11153,6 @@ void V8TestObject::limitedToOnlyAttributeAttributeSetterCallback(const v8::Funct
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::limitedToOnlyAttributeAttributeSetter(v8Value, info);
}
......@@ -11214,8 +11167,6 @@ void V8TestObject::limitedToOnlyOtherAttributeAttributeSetterCallback(const v8::
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::limitedToOnlyOtherAttributeAttributeSetter(v8Value, info);
}
......@@ -11230,8 +11181,6 @@ void V8TestObject::limitedWithMissingDefaultAttributeAttributeSetterCallback(con
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::limitedWithMissingDefaultAttributeAttributeSetter(v8Value, info);
}
......@@ -11246,8 +11195,6 @@ void V8TestObject::limitedWithInvalidMissingDefaultAttributeAttributeSetterCallb
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::limitedWithInvalidMissingDefaultAttributeAttributeSetter(v8Value, info);
}
......@@ -11434,8 +11381,6 @@ void V8TestObject::urlStringAttributeAttributeSetterCallback(const v8::FunctionC
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::urlStringAttributeAttributeSetter(v8Value, info);
}
......@@ -11450,8 +11395,6 @@ void V8TestObject::urlStringAttributeAttributeSetterCallback(const v8::FunctionC
v8::Local<v8::Value> v8Value = info[0];
V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
TestObjectV8Internal::urlStringAttributeAttributeSetter(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