Source/bindings/templates/interface.cpp - Issue 968573004: [bindings] Support extended attribute '[CallWith=ScriptState ]' for getter/setter/deleter.

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

Issue 968573004: [bindings] Support extended attribute '[CallWith=ScriptState ]' for getter/setter/deleter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@972153002

Patch Set: Created 5 years, 10 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

Index: Source/bindings/templates/interface.cpp

diff --git a/Source/bindings/templates/interface.cpp b/Source/bindings/templates/interface.cpp

index 4a7093f8fa246570655831ac2f819cafd32128b9..1f7789f0b8c342717520e9f977a56ef7b3064134 100644

--- a/Source/bindings/templates/interface.cpp

+++ b/Source/bindings/templates/interface.cpp

@@ -11,9 +11,16 @@ static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo

{% if getter.is_raises_exception %}

ExceptionState exceptionState(ExceptionState::IndexedGetterContext, "{{interface_name}}", info.Holder(), info.GetIsolate());

{% endif %}

+ {% if getter.is_call_with_script_state %}

+ {# [CallWith=ScriptState] #}

haraken 2015/03/05 05:56:13 Nit: Remove this comment.

+ ScriptState* scriptState = ScriptState::current(info.GetIsolate());

+ {% endif %}

{% set getter_name = getter.name or 'anonymousIndexedGetter' %}

- {% set getter_arguments = ['index', 'exceptionState']

- if getter.is_raises_exception else ['index'] %}

+ {% set getter_arguments = ['scriptState', 'index']

+ if getter.is_call_with_script_state else ['index'] %}

+ {% if getter.is_raises_exception %}

+ {% set getter_arguments = getter_arguments + ['exceptionState'] %}

haraken 2015/03/05 05:56:13 You can do something like: {% set getter_argument

+ {% endif %}

{{getter.cpp_type}} result = impl->{{getter_name}}({{getter_arguments | join(', ')}});

{% if getter.is_raises_exception %}

if (exceptionState.throwIfNeeded())

@@ -68,9 +75,16 @@ static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value,

return;

}

{% endif %}

+ {% if setter.is_call_with_script_state %}

+ {# [CallWith=ScriptState] #}

+ ScriptState* scriptState = ScriptState::current(info.GetIsolate());

+ {% endif %}

{% set setter_name = setter.name or 'anonymousIndexedSetter' %}

- {% set setter_arguments = ['index', 'propertyValue', 'exceptionState']

- if setter.is_raises_exception else ['index', 'propertyValue'] %}

+ {% set setter_arguments = ['scriptState', 'index', 'propertyValue']

+ if setter.is_call_with_script_state else ['index', 'propertyValue'] %}

+ {% if setter.is_raises_exception %}

+ {% set setter_arguments = setter_arguments + ['exceptionState'] %}

+ {% endif %}

bool result = impl->{{setter_name}}({{setter_arguments | join(', ')}});

{% if setter.is_raises_exception %}

if (exceptionState.throwIfNeeded())

@@ -114,9 +128,16 @@ static void indexedPropertyDeleter(uint32_t index, const v8::PropertyCallbackInf

{% if deleter.is_raises_exception %}

ExceptionState exceptionState(ExceptionState::IndexedDeletionContext, "{{interface_name}}", info.Holder(), info.GetIsolate());

{% endif %}

+ {% if deleter.is_call_with_script_state %}

+ {# [CallWith=ScriptState] #}

+ ScriptState* scriptState = ScriptState::current(info.GetIsolate());

+ {% endif %}

{% set deleter_name = deleter.name or 'anonymousIndexedDeleter' %}

- {% set deleter_arguments = ['index', 'exceptionState']

- if deleter.is_raises_exception else ['index'] %}

+ {% set deleter_arguments = ['scriptState', 'index']

+ if deleter.is_call_with_script_state else ['index'] %}

+ {% if deleter.is_raises_exception %}

+ {% set deleter_arguments = deleter_arguments + ['exceptionState'] %}

+ {% endif %}

DeleteResult result = impl->{{deleter_name}}({{deleter_arguments | join(', ')}});

{% if deleter.is_raises_exception %}

if (exceptionState.throwIfNeeded())

@@ -171,6 +192,9 @@ static void namedPropertyGetter(v8::Local<v8::Name> name, const v8::PropertyCall

v8::String::Utf8Value namedProperty(nameString);

ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "{{interface_name}}", info.Holder(), info.GetIsolate());

{% endif %}

+ {% if getter.is_call_with_script_state %}

+ ScriptState* scriptState = ScriptState::current(info.GetIsolate());

+ {% endif %}

{% if getter.use_output_parameter_for_result %}

{{getter.cpp_type}} result;

{{getter.cpp_value}};

@@ -245,11 +269,18 @@ static void namedPropertySetter(v8::Local<v8::Name> name, v8::Local<v8::Value> v

return;

}

{% endif %}

+ {% if setter.is_call_with_script_state %}

+ {# [CallWith=ScriptState] #}

+ ScriptState* scriptState = ScriptState::current(info.GetIsolate());

+ {% endif %}

{% set setter_name = setter.name or 'anonymousNamedSetter' %}

{% set setter_arguments =

- ['propertyName', 'propertyValue', 'exceptionState']

- if setter.is_raises_exception else

+ ['scriptState', 'propertyName', 'propertyValue']

+ if setter.is_call_with_script_state else

['propertyName', 'propertyValue'] %}

+ {% if setter.is_raises_exception %}

+ {% set setter_arguments = setter_arguments + ['exceptionState'] %}

+ {% endif %}

bool result = impl->{{setter_name}}({{setter_arguments | join(', ')}});

{% if setter.is_raises_exception %}

if (exceptionState.throwIfNeeded())

@@ -342,9 +373,16 @@ static void namedPropertyDeleter(v8::Local<v8::Name> name, const v8::PropertyCal

v8::String::Utf8Value namedProperty(name);

ExceptionState exceptionState(ExceptionState::DeletionContext, *namedProperty, "{{interface_name}}", info.Holder(), info.GetIsolate());

{% endif %}

+ {% if deleter.is_call_with_script_state %}

+ {# [CallWith=ScriptState] #}

+ ScriptState* scriptState = ScriptState::current(info.GetIsolate());

+ {% endif %}

{% set deleter_name = deleter.name or 'anonymousNamedDeleter' %}

- {% set deleter_arguments = ['propertyName', 'exceptionState']

- if deleter.is_raises_exception else ['propertyName'] %}

+ {% set deleter_arguments = ['scriptState', 'propertyName']

+ if deleter.is_call_with_script_state else ['propertyName'] %}

+ {% if deleter.is_raises_exception %}

+ {% set deleter_arguments = deleter_arguments + ['exceptionState'] %}

+ {% endif %}

DeleteResult result = impl->{{deleter_name}}({{deleter_arguments | join(', ')}});

{% if deleter.is_raises_exception %}

if (exceptionState.throwIfNeeded())

« Source/bindings/scripts/v8_interface.py ('K') | « Source/bindings/scripts/v8_interface.py ('k') | Source/bindings/tests/idls/core/TestObject.idl » ('j') | no next file with comments »