Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
index 8e099c63d25560c9934e6f252d1310e81c0e1403..b9860353dfd0c9f1b9fffbf04b44539be683e8ef 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
@@ -44,7 +44,7 @@ namespace blink { |
#pragma clang diagnostic push |
#pragma clang diagnostic ignored "-Wglobal-constructors" |
#endif |
-WrapperTypeInfo V8TestInterface::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface::domTemplate, V8TestInterface::trace, V8TestInterface::traceWrappers, V8TestInterface::toActiveScriptWrappable, V8TestInterface::visitDOMWrapper, V8TestInterface::preparePrototypeAndInterfaceObject, nullptr, "TestInterface", &V8TestInterfaceEmpty::wrapperTypeInfo, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Dependent }; |
+WrapperTypeInfo V8TestInterface::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface::domTemplate, V8TestInterface::trace, V8TestInterface::traceWrappers, V8TestInterface::visitDOMWrapper, V8TestInterface::preparePrototypeAndInterfaceObject, nullptr, "TestInterface", &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 |
@@ -54,6 +54,19 @@ WrapperTypeInfo V8TestInterface::wrapperTypeInfo = { gin::kEmbedderBlink, V8Test |
// bindings/core/v8/ScriptWrappable.h. |
const WrapperTypeInfo& TestInterfaceImplementation::s_wrapperTypeInfo = V8TestInterface::wrapperTypeInfo; |
+// [ActiveScriptWrappable] |
+static_assert( |
+ std::is_base_of<ActiveScriptWrappable, TestInterfaceImplementation>::value, |
+ "TestInterfaceImplementation does not inherit from ActiveScriptWrappable, but specifying " |
+ "[ActiveScriptWrappable] extended attribute in the IDL file. " |
+ "Be consistent."); |
+static_assert( |
+ !std::is_same<decltype(&TestInterfaceImplementation::hasPendingActivity), |
+ decltype(&ScriptWrappable::hasPendingActivity)>::value, |
+ "TestInterfaceImplementation is not overriding hasPendingActivity(), but is specifying " |
+ "[ActiveScriptWrappable] extended attribute in the IDL file. " |
+ "Be consistent."); |
+ |
namespace TestInterfaceImplementationV8Internal { |
static void (*voidMethodPartialOverloadMethodForPartialInterface)(const v8::FunctionCallbackInfo<v8::Value>&) = 0; |
static void (*staticVoidMethodPartialOverloadMethodForPartialInterface)(const v8::FunctionCallbackInfo<v8::Value>&) = 0; |
@@ -2962,11 +2975,6 @@ void V8TestInterface::preparePrototypeAndInterfaceObject(v8::Local<v8::Context> |
} |
} |
-ActiveScriptWrappable* V8TestInterface::toActiveScriptWrappable(v8::Local<v8::Object> wrapper) |
-{ |
- return toImpl(wrapper); |
-} |
- |
bool V8TestInterface::PrivateScript::shortMethodWithShortArgumentImplementedInPrivateScriptMethod(LocalFrame* frame, TestInterface* holderImpl, int value, int* result) |
{ |
if (!frame) |