| Index: third_party/WebKit/Source/bindings/templates/attributes.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/bindings/templates/attributes.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/attributes.cpp.tmpl
|
| index a15b10866050866665ec9daeada3f2af109aa836..063dbf683ba56ecaa9566f3b5f5f78da09200419 100644
|
| --- a/third_party/WebKit/Source/bindings/templates/attributes.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/bindings/templates/attributes.cpp.tmpl
|
| @@ -10,7 +10,7 @@ const v8::FunctionCallbackInfo<v8::Value>& info
|
| {%- endif %}) {
|
| {% filter format_remove_duplicates(['ExceptionState exceptionState']) %}
|
| {% set define_exception_state -%}
|
| - ExceptionState exceptionState(info.GetIsolate(), ExceptionState::GetterContext, "{{interface_name}}", "{{attribute.name}}");
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::kGetterContext, "{{interface_name}}", "{{attribute.name}}");
|
| {%- endset %}
|
|
|
| {% if attribute.is_lenient_this %}
|
| @@ -195,11 +195,11 @@ v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info
|
| const v8::FunctionCallbackInfo<v8::Value>& info
|
| {%- endif %}) {
|
| {% if attribute.deprecate_as %}
|
| - Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::{{attribute.deprecate_as}});
|
| + Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::k{{attribute.deprecate_as}});
|
| {% endif %}
|
|
|
| {% if attribute.measure_as %}
|
| - UseCounter::count(currentExecutionContext(info.GetIsolate()), UseCounter::{{attribute.measure_as('AttributeGetter')}});
|
| + UseCounter::count(currentExecutionContext(info.GetIsolate()), UseCounter::k{{attribute.measure_as('AttributeGetter')}});
|
| {% endif %}
|
|
|
| {% if world_suffix in attribute.activity_logging_world_list_for_getter %}
|
| @@ -240,11 +240,11 @@ static v8::Local<v8::Private> {{attribute.name}}CachedAccessorCallback(v8::Isola
|
| {% macro constructor_getter_callback(attribute, world_suffix) %}
|
| void {{attribute.name}}ConstructorGetterCallback{{world_suffix}}(v8::Local<v8::Name> property, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| {% if attribute.deprecate_as %}
|
| - Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::{{attribute.deprecate_as}});
|
| + Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::k{{attribute.deprecate_as}});
|
| {% endif %}
|
|
|
| {% if attribute.measure_as %}
|
| - UseCounter::count(currentExecutionContext(info.GetIsolate()), UseCounter::{{attribute.measure_as('ConstructorGetter')}});
|
| + UseCounter::count(currentExecutionContext(info.GetIsolate()), UseCounter::k{{attribute.measure_as('ConstructorGetter')}});
|
| {% endif %}
|
|
|
| v8ConstructorAttributeGetter(property, info);
|
| @@ -264,7 +264,7 @@ v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info
|
| {%- endif %}) {
|
| {% filter format_remove_duplicates(['ExceptionState exceptionState']) %}
|
| {% set define_exception_state -%}
|
| - ExceptionState exceptionState(info.GetIsolate(), ExceptionState::SetterContext, "{{interface_name}}", "{{attribute.name}}");
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::kSetterContext, "{{interface_name}}", "{{attribute.name}}");
|
| {%- endset %}
|
|
|
| {% if attribute.is_lenient_this %}
|
| @@ -332,7 +332,7 @@ v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info
|
| DummyExceptionStateForTesting dummyExceptionState;
|
| {{declare_enum_validation_variable(attribute.enum_values) | indent(2)}}
|
| if (!isValidEnum(cppValue, validValues, WTF_ARRAY_LENGTH(validValues), "{{attribute.enum_type}}", dummyExceptionState)) {
|
| - currentExecutionContext(info.GetIsolate())->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, dummyExceptionState.message()));
|
| + currentExecutionContext(info.GetIsolate())->addConsoleMessage(ConsoleMessage::create(kJSMessageSource, kWarningMessageLevel, dummyExceptionState.message()));
|
| return;
|
| }
|
| {% endif %}
|
| @@ -377,11 +377,11 @@ const v8::FunctionCallbackInfo<v8::Value>& info
|
| {% endif %}
|
|
|
| {% if attribute.deprecate_as %}
|
| - Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::{{attribute.deprecate_as}});
|
| + Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::k{{attribute.deprecate_as}});
|
| {% endif %}
|
|
|
| {% if attribute.measure_as %}
|
| - UseCounter::count(currentExecutionContext(info.GetIsolate()), UseCounter::{{attribute.measure_as('AttributeSetter')}});
|
| + UseCounter::count(currentExecutionContext(info.GetIsolate()), UseCounter::k{{attribute.measure_as('AttributeSetter')}});
|
| {% endif %}
|
|
|
| {% if world_suffix in attribute.activity_logging_world_list_for_setter %}
|
| @@ -457,8 +457,8 @@ const v8::FunctionCallbackInfo<v8::Value>& info
|
| '%sV8Internal::%sCachedAccessorCallback' % (cpp_class_or_partial, attribute.name)
|
| if attribute.is_cached_accessor else
|
| 'nullptr' %}
|
| -{% set holder_check = 'V8DOMConfiguration::DoNotCheckHolder'
|
| - if attribute.is_lenient_this else 'V8DOMConfiguration::CheckHolder' %}
|
| +{% set holder_check = 'V8DOMConfiguration::kDoNotCheckHolder'
|
| + if attribute.is_lenient_this else 'V8DOMConfiguration::kCheckHolder' %}
|
| {% set attribute_configuration_list = [
|
| '"%s"' % attribute.name,
|
| getter_callback,
|
|
|