| Index: third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| index 5d9f55493ca88bd9ef1b8d551ce47fb8c8f97be2..42f9843471176211f30e322f88616a95c11251df 100644
|
| --- a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| @@ -20,12 +20,12 @@ namespace blink {
|
| else 'nullptr' %}
|
| {% set parent_wrapper_type_info = '&V8%s::wrapperTypeInfo' % parent_interface
|
| if parent_interface else '0' %}
|
| -{% set wrapper_type_prototype = 'WrapperTypeExceptionPrototype' if is_exception else
|
| - 'WrapperTypeObjectPrototype' %}
|
| +{% set wrapper_type_prototype = 'kWrapperTypeExceptionPrototype' if is_exception else
|
| + 'kWrapperTypeObjectPrototype' %}
|
| {% set active_scriptwrappable_inheritance =
|
| - 'InheritFromActiveScriptWrappable'
|
| + 'kInheritFromActiveScriptWrappable'
|
| if active_scriptwrappable else
|
| - 'NotInheritFromActiveScriptWrappable' %}
|
| + 'kNotInheritFromActiveScriptWrappable' %}
|
|
|
| {% set wrapper_type_info_const = '' if has_partial_interface else 'const ' %}
|
| {% if not is_partial %}
|
| @@ -44,7 +44,7 @@ namespace blink {
|
| // This static member must be declared by DEFINE_WRAPPERTYPEINFO in {{cpp_class}}.h.
|
| // For details, see the comment of DEFINE_WRAPPERTYPEINFO in
|
| // bindings/core/v8/ScriptWrappable.h.
|
| -const WrapperTypeInfo& {{cpp_class}}::s_wrapperTypeInfo = {{v8_class}}::wrapperTypeInfo;
|
| +const WrapperTypeInfo& {{cpp_class}}::wrapper_type_info_ = {{v8_class}}::wrapperTypeInfo;
|
| {% endif %}
|
|
|
| {% if active_scriptwrappable %}
|
| @@ -197,11 +197,11 @@ bool securityCheck(v8::Local<v8::Context> accessingContext, v8::Local<v8::Object
|
| return false; // the frame is gone.
|
|
|
| const DOMWindow* targetWindow = V8Window::toImpl(window);
|
| - return BindingSecurity::shouldAllowAccessTo(toLocalDOMWindow(toDOMWindow(accessingContext)), targetWindow, BindingSecurity::ErrorReportOption::DoNotReport);
|
| + return BindingSecurity::shouldAllowAccessTo(toLocalDOMWindow(toDOMWindow(accessingContext)), targetWindow, BindingSecurity::ErrorReportOption::kDoNotReport);
|
| {% else %}{# if interface_name == 'Window' #}
|
| {# Not 'Window' means it\'s Location. #}
|
| {{cpp_class}}* impl = {{v8_class}}::toImpl(accessedObject);
|
| - return BindingSecurity::shouldAllowAccessTo(toLocalDOMWindow(toDOMWindow(accessingContext)), impl, BindingSecurity::ErrorReportOption::DoNotReport);
|
| + return BindingSecurity::shouldAllowAccessTo(toLocalDOMWindow(toDOMWindow(accessingContext)), impl, BindingSecurity::ErrorReportOption::kDoNotReport);
|
| {% endif %}{# if interface_name == 'Window' #}
|
| }
|
|
|
| @@ -399,7 +399,7 @@ static void install{{v8_class}}Template(v8::Isolate* isolate, const DOMWrapperWo
|
| 'V8%s::domTemplate(isolate, world)' % parent_interface
|
| if parent_interface else
|
| 'v8::Local<v8::FunctionTemplate>()' %}
|
| - V8DOMConfiguration::initializeDOMInterfaceTemplate(isolate, interfaceTemplate, {{v8_class}}::wrapperTypeInfo.interfaceName, {{parent_interface_template}}, {{v8_class}}::internalFieldCount);
|
| + V8DOMConfiguration::initializeDOMInterfaceTemplate(isolate, interfaceTemplate, {{v8_class}}::wrapperTypeInfo.interface_name, {{parent_interface_template}}, {{v8_class}}::internalFieldCount);
|
| {% if constructors or has_custom_constructor or has_event_constructor or has_html_constructor %}
|
| interfaceTemplate->SetCallHandler({{v8_class}}::constructorCallback);
|
| interfaceTemplate->SetLength({{interface_length}});
|
| @@ -486,7 +486,7 @@ static void install{{v8_class}}Template(v8::Isolate* isolate, const DOMWrapperWo
|
| {% filter exposed(iterator_method.exposed_test) %}
|
| {% filter runtime_enabled(iterator_method.runtime_enabled_feature_name) %}
|
| // Iterator (@@iterator)
|
| - const V8DOMConfiguration::SymbolKeyedMethodConfiguration symbolKeyedIteratorConfiguration = { v8::Symbol::GetIterator, {{cpp_class_or_partial}}V8Internal::iteratorMethodCallback, 0, v8::DontEnum, V8DOMConfiguration::OnPrototype };
|
| + const V8DOMConfiguration::SymbolKeyedMethodConfiguration symbolKeyedIteratorConfiguration = { v8::Symbol::GetIterator, {{cpp_class_or_partial}}V8Internal::iteratorMethodCallback, 0, v8::DontEnum, V8DOMConfiguration::kOnPrototype };
|
| V8DOMConfiguration::installMethod(isolate, world, prototypeTemplate, signature, symbolKeyedIteratorConfiguration);
|
| {% endfilter %}
|
| {% endfilter %}
|
|
|