| Index: third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp b/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| index 0b7e4b7e8e4b71d1c535a1dc88682fa73cb43239..8488587c6f14985c09b5be2888c8b8d54f51952c 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| @@ -29,7 +29,7 @@ namespace blink {
|
| #pragma clang diagnostic push
|
| #pragma clang diagnostic ignored "-Wglobal-constructors"
|
| #endif
|
| -const WrapperTypeInfo V8TestInterface5::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface5::domTemplate, V8TestInterface5::trace, V8TestInterface5::traceWrappers, V8TestInterface5::toActiveScriptWrappable, V8TestInterface5::visitDOMWrapper, V8TestInterface5::preparePrototypeAndInterfaceObject, nullptr, "TestInterface5", &V8TestInterfaceEmpty::wrapperTypeInfo, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Dependent };
|
| +const WrapperTypeInfo V8TestInterface5::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface5::domTemplate, V8TestInterface5::trace, V8TestInterface5::traceWrappers, V8TestInterface5::visitDOMWrapper, V8TestInterface5::preparePrototypeAndInterfaceObject, nullptr, "TestInterface5", &V8TestInterfaceEmpty::wrapperTypeInfo, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::InheritFromActiveScriptWrappable, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Dependent };
|
| #if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)
|
| #pragma clang diagnostic pop
|
| #endif
|
| @@ -39,6 +39,19 @@ const WrapperTypeInfo V8TestInterface5::wrapperTypeInfo = { gin::kEmbedderBlink,
|
| // bindings/core/v8/ScriptWrappable.h.
|
| const WrapperTypeInfo& TestInterface5Implementation::s_wrapperTypeInfo = V8TestInterface5::wrapperTypeInfo;
|
|
|
| +// [ActiveScriptWrappable]
|
| +static_assert(
|
| + std::is_base_of<ActiveScriptWrappable, TestInterface5Implementation>::value,
|
| + "TestInterface5Implementation does not inherit from ActiveScriptWrappable, but specifying "
|
| + "[ActiveScriptWrappable] extended attribute in the IDL file. "
|
| + "Be consistent.");
|
| +static_assert(
|
| + !std::is_same<decltype(&TestInterface5Implementation::hasPendingActivity),
|
| + decltype(&ScriptWrappable::hasPendingActivity)>::value,
|
| + "TestInterface5Implementation is not overriding hasPendingActivity(), but is specifying "
|
| + "[ActiveScriptWrappable] extended attribute in the IDL file. "
|
| + "Be consistent.");
|
| +
|
| namespace TestInterface5ImplementationV8Internal {
|
|
|
| static void testInterfaceAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -922,9 +935,4 @@ void V8TestInterface5::preparePrototypeAndInterfaceObject(v8::Local<v8::Context>
|
| }
|
| }
|
|
|
| -ActiveScriptWrappable* V8TestInterface5::toActiveScriptWrappable(v8::Local<v8::Object> wrapper)
|
| -{
|
| - return toImpl(wrapper);
|
| -}
|
| -
|
| } // namespace blink
|
|
|