Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceEventTarget.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceEventTarget.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceEventTarget.cpp |
index 3693e8a1e1251a57b4fcb128cd77bf3668662c86..3448c5b984d4bdf508a70aee53021cfda0acd7fe 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceEventTarget.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceEventTarget.cpp |
@@ -22,7 +22,7 @@ namespace blink { |
#pragma clang diagnostic push |
#pragma clang diagnostic ignored "-Wglobal-constructors" |
#endif |
-const WrapperTypeInfo V8TestInterfaceEventTarget::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceEventTarget::domTemplate, V8TestInterfaceEventTarget::trace, V8TestInterfaceEventTarget::traceWrappers, 0, 0, V8TestInterfaceEventTarget::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceEventTarget", &V8EventTarget::wrapperTypeInfo, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::InheritFromEventTarget, WrapperTypeInfo::Independent }; |
+const WrapperTypeInfo V8TestInterfaceEventTarget::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceEventTarget::domTemplate, V8TestInterfaceEventTarget::trace, V8TestInterfaceEventTarget::traceWrappers, 0, V8TestInterfaceEventTarget::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceEventTarget", &V8EventTarget::wrapperTypeInfo, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromActiveScriptWrappable, WrapperTypeInfo::InheritFromEventTarget, WrapperTypeInfo::Independent }; |
#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG) |
#pragma clang diagnostic pop |
#endif |
@@ -32,9 +32,16 @@ const WrapperTypeInfo V8TestInterfaceEventTarget::wrapperTypeInfo = { gin::kEmbe |
// bindings/core/v8/ScriptWrappable.h. |
const WrapperTypeInfo& TestInterfaceEventTarget::s_wrapperTypeInfo = V8TestInterfaceEventTarget::wrapperTypeInfo; |
+// not [ActiveScriptWrappable] |
static_assert( |
!std::is_base_of<ActiveScriptWrappable, TestInterfaceEventTarget>::value, |
- "TestInterfaceEventTarget inherits from ActiveScriptWrappable, but does not specify " |
+ "TestInterfaceEventTarget inherits from ActiveScriptWrappable, but is not specifying " |
+ "[ActiveScriptWrappable] extended attribute in the IDL file. " |
+ "Be consistent."); |
+static_assert( |
+ std::is_same<decltype(&TestInterfaceEventTarget::hasPendingActivity), |
+ decltype(&ScriptWrappable::hasPendingActivity)>::value, |
+ "TestInterfaceEventTarget is overriding hasPendingActivity(), but is not specifying " |
"[ActiveScriptWrappable] extended attribute in the IDL file. " |
"Be consistent."); |
@@ -48,7 +55,7 @@ namespace TestInterfaceEventTargetV8Internal { |
#pragma clang diagnostic push |
#pragma clang diagnostic ignored "-Wglobal-constructors" |
#endif |
-const WrapperTypeInfo V8TestInterfaceEventTargetConstructor::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceEventTargetConstructor::domTemplate, V8TestInterfaceEventTarget::trace, V8TestInterfaceEventTarget::traceWrappers, 0, 0, V8TestInterfaceEventTarget::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceEventTarget", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::InheritFromEventTarget, WrapperTypeInfo::Independent }; |
+const WrapperTypeInfo V8TestInterfaceEventTargetConstructor::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceEventTargetConstructor::domTemplate, V8TestInterfaceEventTarget::trace, V8TestInterfaceEventTarget::traceWrappers, 0, V8TestInterfaceEventTarget::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceEventTarget", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromActiveScriptWrappable, WrapperTypeInfo::InheritFromEventTarget, WrapperTypeInfo::Independent }; |
#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG) |
#pragma clang diagnostic pop |
#endif |