| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface3.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface3.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface3.cpp
|
| index f719f742278934232b6fce7404cdb5264677b03f..2b3e8a361866511c21035d18ec102532dc691eec 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface3.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface3.cpp
|
| @@ -66,10 +66,6 @@ static void readonlyStringifierAttributeAttributeGetter(const v8::FunctionCallba
|
| v8SetReturnValueString(info, impl->readonlyStringifierAttribute(), info.GetIsolate());
|
| }
|
|
|
| -CORE_EXPORT void readonlyStringifierAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::readonlyStringifierAttributeAttributeGetter(info);
|
| -}
|
| -
|
| static void voidMethodDocumentMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| TestInterface3* impl = V8TestInterface3::toImpl(info.Holder());
|
|
|
| @@ -89,10 +85,6 @@ static void voidMethodDocumentMethod(const v8::FunctionCallbackInfo<v8::Value>&
|
| impl->voidMethodDocument(document);
|
| }
|
|
|
| -CORE_EXPORT void voidMethodDocumentMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::voidMethodDocumentMethod(info);
|
| -}
|
| -
|
| static void keysMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterface3", "keys");
|
|
|
| @@ -107,10 +99,6 @@ static void keysMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void keysMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::keysMethod(info);
|
| -}
|
| -
|
| static void valuesMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterface3", "values");
|
|
|
| @@ -125,10 +113,6 @@ static void valuesMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void valuesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::valuesMethod(info);
|
| -}
|
| -
|
| static void entriesMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterface3", "entries");
|
|
|
| @@ -143,10 +127,6 @@ static void entriesMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void entriesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::entriesMethod(info);
|
| -}
|
| -
|
| static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterface3", "forEach");
|
|
|
| @@ -176,20 +156,12 @@ static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| }
|
| }
|
|
|
| -CORE_EXPORT void forEachMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::forEachMethod(info);
|
| -}
|
| -
|
| static void toStringMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| TestInterface3* impl = V8TestInterface3::toImpl(info.Holder());
|
|
|
| v8SetReturnValueString(info, impl->readonlyStringifierAttribute(), info.GetIsolate());
|
| }
|
|
|
| -CORE_EXPORT void toStringMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestInterface3V8Internal::toStringMethod(info);
|
| -}
|
| -
|
| static void iteratorMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestInterface3", "iterator");
|
|
|
| @@ -204,11 +176,41 @@ static void iteratorMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void iteratorMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| +} // namespace TestInterface3V8Internal
|
| +
|
| +void V8TestInterface3::readonlyStringifierAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::readonlyStringifierAttributeAttributeGetter(info);
|
| +}
|
| +
|
| +void V8TestInterface3::voidMethodDocumentMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::voidMethodDocumentMethod(info);
|
| +}
|
| +
|
| +void V8TestInterface3::keysMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::keysMethod(info);
|
| +}
|
| +
|
| +void V8TestInterface3::valuesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::valuesMethod(info);
|
| +}
|
| +
|
| +void V8TestInterface3::entriesMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::entriesMethod(info);
|
| +}
|
| +
|
| +void V8TestInterface3::forEachMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::forEachMethod(info);
|
| +}
|
| +
|
| +void V8TestInterface3::toStringMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestInterface3V8Internal::toStringMethod(info);
|
| +}
|
| +
|
| +void V8TestInterface3::iteratorMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| TestInterface3V8Internal::iteratorMethod(info);
|
| }
|
|
|
| -CORE_EXPORT void namedPropertyGetterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| +void V8TestInterface3::namedPropertyGetterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| if (!name->IsString())
|
| return;
|
| const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
|
| @@ -216,7 +218,7 @@ CORE_EXPORT void namedPropertyGetterCallback(v8::Local<v8::Name> name, const v8:
|
| V8TestInterface3::namedPropertyGetterCustom(propertyName, info);
|
| }
|
|
|
| -CORE_EXPORT void namedPropertySetterCallback(v8::Local<v8::Name> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| +void V8TestInterface3::namedPropertySetterCallback(v8::Local<v8::Name> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| if (!name->IsString())
|
| return;
|
| const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
|
| @@ -224,7 +226,7 @@ CORE_EXPORT void namedPropertySetterCallback(v8::Local<v8::Name> name, v8::Local
|
| V8TestInterface3::namedPropertySetterCustom(propertyName, v8Value, info);
|
| }
|
|
|
| -CORE_EXPORT void namedPropertyDeleterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
|
| +void V8TestInterface3::namedPropertyDeleterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
|
| if (!name->IsString())
|
| return;
|
| const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
|
| @@ -232,7 +234,7 @@ CORE_EXPORT void namedPropertyDeleterCallback(v8::Local<v8::Name> name, const v8
|
| V8TestInterface3::namedPropertyDeleterCustom(propertyName, info);
|
| }
|
|
|
| -CORE_EXPORT void namedPropertyQueryCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Integer>& info) {
|
| +void V8TestInterface3::namedPropertyQueryCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Integer>& info) {
|
| if (!name->IsString())
|
| return;
|
| const AtomicString& propertyName = toCoreAtomicString(name.As<v8::String>());
|
| @@ -240,35 +242,33 @@ CORE_EXPORT void namedPropertyQueryCallback(v8::Local<v8::Name> name, const v8::
|
| V8TestInterface3::namedPropertyQueryCustom(propertyName, info);
|
| }
|
|
|
| -CORE_EXPORT void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info) {
|
| +void V8TestInterface3::namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info) {
|
| V8TestInterface3::namedPropertyEnumeratorCustom(info);
|
| }
|
|
|
| -CORE_EXPORT void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| +void V8TestInterface3::indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| V8TestInterface3::indexedPropertyGetterCustom(index, info);
|
| }
|
|
|
| -CORE_EXPORT void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| +void V8TestInterface3::indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info) {
|
| V8TestInterface3::indexedPropertySetterCustom(index, v8Value, info);
|
| }
|
|
|
| -CORE_EXPORT void indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
|
| +void V8TestInterface3::indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info) {
|
| V8TestInterface3::indexedPropertyDeleterCustom(index, info);
|
| }
|
|
|
| -} // namespace TestInterface3V8Internal
|
| -
|
| void V8TestInterface3::visitDOMWrapper(v8::Isolate* isolate, ScriptWrappable* scriptWrappable, const v8::Persistent<v8::Object>& wrapper) {
|
| V8TestInterface3::visitDOMWrapperCustom(isolate, scriptWrappable, wrapper);
|
| }
|
|
|
| const V8DOMConfiguration::AccessorConfiguration V8TestInterface3Accessors[] = {
|
| - {"readonlyStringifierAttribute", TestInterface3V8Internal::readonlyStringifierAttributeAttributeGetterCallback, 0, 0, 0, nullptr, 0, static_cast<v8::PropertyAttribute>(v8::ReadOnly), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"readonlyStringifierAttribute", V8TestInterface3::readonlyStringifierAttributeAttributeGetterCallback, nullptr, nullptr, nullptr, nullptr, nullptr, static_cast<v8::PropertyAttribute>(v8::ReadOnly), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| };
|
|
|
| const V8DOMConfiguration::MethodConfiguration V8TestInterface3Methods[] = {
|
| - {"voidMethodDocument", TestInterface3V8Internal::voidMethodDocumentMethodCallback, 0, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"toString", TestInterface3V8Internal::toStringMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"voidMethodDocument", V8TestInterface3::voidMethodDocumentMethodCallback, nullptr, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"toString", V8TestInterface3::toStringMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| };
|
|
|
| static void installV8TestInterface3Template(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::FunctionTemplate> interfaceTemplate) {
|
| @@ -287,32 +287,32 @@ static void installV8TestInterface3Template(v8::Isolate* isolate, const DOMWrapp
|
| V8DOMConfiguration::installMethods(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, V8TestInterface3Methods, WTF_ARRAY_LENGTH(V8TestInterface3Methods));
|
|
|
| // Indexed properties
|
| - v8::IndexedPropertyHandlerConfiguration indexedPropertyHandlerConfig(TestInterface3V8Internal::indexedPropertyGetterCallback, TestInterface3V8Internal::indexedPropertySetterCallback, 0, TestInterface3V8Internal::indexedPropertyDeleterCallback, indexedPropertyEnumerator<TestInterface3>, v8::Local<v8::Value>(), v8::PropertyHandlerFlags::kNone);
|
| + v8::IndexedPropertyHandlerConfiguration indexedPropertyHandlerConfig(V8TestInterface3::indexedPropertyGetterCallback, V8TestInterface3::indexedPropertySetterCallback, nullptr, V8TestInterface3::indexedPropertyDeleterCallback, indexedPropertyEnumerator<TestInterface3>, v8::Local<v8::Value>(), v8::PropertyHandlerFlags::kNone);
|
| instanceTemplate->SetHandler(indexedPropertyHandlerConfig);
|
| // Named properties
|
| - v8::NamedPropertyHandlerConfiguration namedPropertyHandlerConfig(TestInterface3V8Internal::namedPropertyGetterCallback, TestInterface3V8Internal::namedPropertySetterCallback, TestInterface3V8Internal::namedPropertyQueryCallback, TestInterface3V8Internal::namedPropertyDeleterCallback, TestInterface3V8Internal::namedPropertyEnumeratorCallback, v8::Local<v8::Value>(), static_cast<v8::PropertyHandlerFlags>(int(v8::PropertyHandlerFlags::kOnlyInterceptStrings) | int(v8::PropertyHandlerFlags::kNonMasking)));
|
| + v8::NamedPropertyHandlerConfiguration namedPropertyHandlerConfig(V8TestInterface3::namedPropertyGetterCallback, V8TestInterface3::namedPropertySetterCallback, V8TestInterface3::namedPropertyQueryCallback, V8TestInterface3::namedPropertyDeleterCallback, V8TestInterface3::namedPropertyEnumeratorCallback, v8::Local<v8::Value>(), static_cast<v8::PropertyHandlerFlags>(int(v8::PropertyHandlerFlags::kOnlyInterceptStrings) | int(v8::PropertyHandlerFlags::kNonMasking)));
|
| instanceTemplate->SetHandler(namedPropertyHandlerConfig);
|
|
|
| if (RuntimeEnabledFeatures::featureNameEnabled()) {
|
| // Iterator (@@iterator)
|
| - const V8DOMConfiguration::SymbolKeyedMethodConfiguration symbolKeyedIteratorConfiguration = { v8::Symbol::GetIterator, TestInterface3V8Internal::iteratorMethodCallback, 0, v8::DontEnum, V8DOMConfiguration::OnPrototype };
|
| + const V8DOMConfiguration::SymbolKeyedMethodConfiguration symbolKeyedIteratorConfiguration = { v8::Symbol::GetIterator, V8TestInterface3::iteratorMethodCallback, 0, v8::DontEnum, V8DOMConfiguration::OnPrototype };
|
| V8DOMConfiguration::installMethod(isolate, world, prototypeTemplate, signature, symbolKeyedIteratorConfiguration);
|
| }
|
|
|
| if (RuntimeEnabledFeatures::featureNameEnabled()) {
|
| - const V8DOMConfiguration::MethodConfiguration keysMethodConfiguration = {"keys", TestInterface3V8Internal::keysMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| + const V8DOMConfiguration::MethodConfiguration keysMethodConfiguration = {"keys", V8TestInterface3::keysMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| V8DOMConfiguration::installMethod(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, keysMethodConfiguration);
|
| }
|
| if (RuntimeEnabledFeatures::featureNameEnabled()) {
|
| - const V8DOMConfiguration::MethodConfiguration valuesMethodConfiguration = {"values", TestInterface3V8Internal::valuesMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| + const V8DOMConfiguration::MethodConfiguration valuesMethodConfiguration = {"values", V8TestInterface3::valuesMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| V8DOMConfiguration::installMethod(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, valuesMethodConfiguration);
|
| }
|
| if (RuntimeEnabledFeatures::featureNameEnabled()) {
|
| - const V8DOMConfiguration::MethodConfiguration entriesMethodConfiguration = {"entries", TestInterface3V8Internal::entriesMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| + const V8DOMConfiguration::MethodConfiguration entriesMethodConfiguration = {"entries", V8TestInterface3::entriesMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| V8DOMConfiguration::installMethod(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, entriesMethodConfiguration);
|
| }
|
| if (RuntimeEnabledFeatures::featureNameEnabled()) {
|
| - const V8DOMConfiguration::MethodConfiguration forEachMethodConfiguration = {"forEach", TestInterface3V8Internal::forEachMethodCallback, 0, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| + const V8DOMConfiguration::MethodConfiguration forEachMethodConfiguration = {"forEach", V8TestInterface3::forEachMethodCallback, nullptr, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
|
| V8DOMConfiguration::installMethod(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, forEachMethodConfiguration);
|
| }
|
| }
|
|
|