Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp |
index be3ae0b2ae9cc4b6c689d85648ac8417ccd7f429..680424b16e880e914d2cea74cce38fbedfb9946e 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp |
@@ -29,7 +29,7 @@ namespace blink { |
#pragma clang diagnostic push |
#pragma clang diagnostic ignored "-Wglobal-constructors" |
#endif |
-WrapperTypeInfo V8TestInterface2::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface2::domTemplate, V8TestInterface2::trace, V8TestInterface2::traceWrappers, V8TestInterface2::toActiveScriptWrappable, V8TestInterface2::visitDOMWrapper, V8TestInterface2::preparePrototypeAndInterfaceObject, nullptr, "TestInterface2", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Dependent }; |
+WrapperTypeInfo V8TestInterface2::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface2::domTemplate, V8TestInterface2::trace, V8TestInterface2::traceWrappers, V8TestInterface2::visitDOMWrapper, V8TestInterface2::preparePrototypeAndInterfaceObject, nullptr, "TestInterface2", 0, 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 @@ WrapperTypeInfo V8TestInterface2::wrapperTypeInfo = { gin::kEmbedderBlink, V8Tes |
// bindings/core/v8/ScriptWrappable.h. |
const WrapperTypeInfo& TestInterface2::s_wrapperTypeInfo = V8TestInterface2::wrapperTypeInfo; |
+// [ActiveScriptWrappable] |
+static_assert( |
+ std::is_base_of<ActiveScriptWrappable, TestInterface2>::value, |
+ "TestInterface2 does not inherit from ActiveScriptWrappable, but specifying " |
+ "[ActiveScriptWrappable] extended attribute in the IDL file. " |
+ "Be consistent."); |
+static_assert( |
+ !std::is_same<decltype(&TestInterface2::hasPendingActivity), |
+ decltype(&ScriptWrappable::hasPendingActivity)>::value, |
+ "TestInterface2 is not overriding hasPendingActivity(), but is specifying " |
+ "[ActiveScriptWrappable] extended attribute in the IDL file. " |
+ "Be consistent."); |
+ |
namespace TestInterface2V8Internal { |
static void itemMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
@@ -656,11 +669,6 @@ TestInterface2* V8TestInterface2::toImplWithTypeCheck(v8::Isolate* isolate, v8:: |
return hasInstance(value, isolate) ? toImpl(v8::Local<v8::Object>::Cast(value)) : nullptr; |
} |
-ActiveScriptWrappable* V8TestInterface2::toActiveScriptWrappable(v8::Local<v8::Object> wrapper) |
-{ |
- return toImpl(wrapper); |
-} |
- |
InstallTemplateFunction V8TestInterface2::installV8TestInterface2TemplateFunction = (InstallTemplateFunction)&V8TestInterface2::installV8TestInterface2Template; |
void V8TestInterface2::updateWrapperTypeInfo(InstallTemplateFunction installTemplateFunction, PreparePrototypeAndInterfaceObjectFunction preparePrototypeAndInterfaceObjectFunction) |