third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp - Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable.

Unified Diff: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp

Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed review comments. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor.cpp ('k') | third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp

diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp

index f60ff7efb0a7389e5406cc9657e6558f6589ab69..4fb61af172009867a86c10b6a2cc6c1192ada276 100644

--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp

+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceNamedConstructor2.cpp

@@ -22,7 +22,7 @@ namespace blink {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wglobal-constructors"

#endif

-const WrapperTypeInfo V8TestInterfaceNamedConstructor2::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceNamedConstructor2::domTemplate, V8TestInterfaceNamedConstructor2::trace, V8TestInterfaceNamedConstructor2::traceWrappers, 0, 0, V8TestInterfaceNamedConstructor2::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceNamedConstructor2", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Independent };

+const WrapperTypeInfo V8TestInterfaceNamedConstructor2::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceNamedConstructor2::domTemplate, V8TestInterfaceNamedConstructor2::trace, V8TestInterfaceNamedConstructor2::traceWrappers, 0, V8TestInterfaceNamedConstructor2::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceNamedConstructor2", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromActiveScriptWrappable, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Independent };

#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)

#pragma clang diagnostic pop

#endif

@@ -32,9 +32,16 @@ const WrapperTypeInfo V8TestInterfaceNamedConstructor2::wrapperTypeInfo = { gin:

// bindings/core/v8/ScriptWrappable.h.

const WrapperTypeInfo& TestInterfaceNamedConstructor2::s_wrapperTypeInfo = V8TestInterfaceNamedConstructor2::wrapperTypeInfo;

+// not [ActiveScriptWrappable]

static_assert(

!std::is_base_of<ActiveScriptWrappable, TestInterfaceNamedConstructor2>::value,

- "TestInterfaceNamedConstructor2 inherits from ActiveScriptWrappable, but does not specify "

+ "TestInterfaceNamedConstructor2 inherits from ActiveScriptWrappable, but is not specifying "

+ "[ActiveScriptWrappable] extended attribute in the IDL file. "

+ "Be consistent.");

+static_assert(

+ std::is_same<decltype(&TestInterfaceNamedConstructor2::hasPendingActivity),

+ decltype(&ScriptWrappable::hasPendingActivity)>::value,

+ "TestInterfaceNamedConstructor2 is overriding hasPendingActivity(), but is not specifying "

"[ActiveScriptWrappable] extended attribute in the IDL file. "

"Be consistent.");

@@ -48,7 +55,7 @@ namespace TestInterfaceNamedConstructor2V8Internal {

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wglobal-constructors"

#endif

-const WrapperTypeInfo V8TestInterfaceNamedConstructor2Constructor::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceNamedConstructor2Constructor::domTemplate, V8TestInterfaceNamedConstructor2::trace, V8TestInterfaceNamedConstructor2::traceWrappers, 0, 0, V8TestInterfaceNamedConstructor2::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceNamedConstructor2", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Independent };

+const WrapperTypeInfo V8TestInterfaceNamedConstructor2Constructor::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterfaceNamedConstructor2Constructor::domTemplate, V8TestInterfaceNamedConstructor2::trace, V8TestInterfaceNamedConstructor2::traceWrappers, 0, V8TestInterfaceNamedConstructor2::preparePrototypeAndInterfaceObject, nullptr, "TestInterfaceNamedConstructor2", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::ObjectClassId, WrapperTypeInfo::NotInheritFromActiveScriptWrappable, WrapperTypeInfo::NotInheritFromEventTarget, WrapperTypeInfo::Independent };

#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)

#pragma clang diagnostic pop

#endif