Index: Source/bindings/tests/results/core/V8TestInterfaceWillBeGarbageCollected.cpp |
diff --git a/Source/bindings/tests/results/core/V8TestInterfaceWillBeGarbageCollected.cpp b/Source/bindings/tests/results/core/V8TestInterfaceWillBeGarbageCollected.cpp |
index 9e0fbe02b703b2f47a407ab200e44ef9157865c9..b3f0b383843890bcc42bb26e7b6f1439d4ba9878 100644 |
--- a/Source/bindings/tests/results/core/V8TestInterfaceWillBeGarbageCollected.cpp |
+++ b/Source/bindings/tests/results/core/V8TestInterfaceWillBeGarbageCollected.cpp |
@@ -39,21 +39,21 @@ |
namespace TestInterfaceWillBeGarbageCollectedV8Internal { |
-static void attr1AttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info) |
+static void attr1AttributeGetter(const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
v8::Local<v8::Object> holder = info.Holder(); |
TestInterfaceWillBeGarbageCollected* impl = V8TestInterfaceWillBeGarbageCollected::toImpl(holder); |
v8SetReturnValueFast(info, WTF::getPtr(impl->attr1()), impl); |
} |
-static void attr1AttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) |
+static void attr1AttributeGetterCallback(v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter"); |
TestInterfaceWillBeGarbageCollectedV8Internal::attr1AttributeGetter(info); |
TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); |
} |
-static void attr1AttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info) |
+static void attr1AttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
{ |
v8::Local<v8::Object> holder = info.Holder(); |
TestInterfaceWillBeGarbageCollected* impl = V8TestInterfaceWillBeGarbageCollected::toImpl(holder); |
@@ -61,9 +61,8 @@ |
impl->setAttr1(WTF::getPtr(cppValue)); |
} |
-static void attr1AttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) |
-{ |
- v8::Local<v8::Value> v8Value = info[0]; |
+static void attr1AttributeSetterCallback(v8::Local<v8::Name>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
+{ |
TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMSetter"); |
TestInterfaceWillBeGarbageCollectedV8Internal::attr1AttributeSetter(v8Value, info); |
TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); |
@@ -110,9 +109,18 @@ |
} // namespace TestInterfaceWillBeGarbageCollectedV8Internal |
-static const V8DOMConfiguration::AccessorConfiguration V8TestInterfaceWillBeGarbageCollectedAccessors[] = { |
- {"attr1", TestInterfaceWillBeGarbageCollectedV8Internal::attr1AttributeGetterCallback, TestInterfaceWillBeGarbageCollectedV8Internal::attr1AttributeSetterCallback, 0, 0, 0, v8::DEFAULT, static_cast<v8::PropertyAttribute>(v8::DontDelete), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnInstance, V8DOMConfiguration::CheckHolder}, |
+// Suppress warning: global constructors, because AttributeConfiguration is trivial |
+// and does not depend on another global objects. |
+#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG) |
+#pragma clang diagnostic push |
+#pragma clang diagnostic ignored "-Wglobal-constructors" |
+#endif |
+static const V8DOMConfiguration::AttributeConfiguration V8TestInterfaceWillBeGarbageCollectedAttributes[] = { |
+ {"attr1", TestInterfaceWillBeGarbageCollectedV8Internal::attr1AttributeGetterCallback, TestInterfaceWillBeGarbageCollectedV8Internal::attr1AttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::PROHIBITS_OVERWRITING), static_cast<v8::PropertyAttribute>(v8::DontDelete), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnInstance, V8DOMConfiguration::CheckHolder}, |
}; |
+#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG) |
+#pragma clang diagnostic pop |
+#endif |
// Suppress warning: global constructors, because struct WrapperTypeInfo is trivial |
// and does not depend on another global objects. |
@@ -192,8 +200,8 @@ |
v8::Local<v8::Signature> defaultSignature; |
defaultSignature = V8DOMConfiguration::installDOMClassTemplate(isolate, functionTemplate, "TestInterfaceWillBeGarbageCollected", V8EventTarget::domTemplate(isolate), V8TestInterfaceWillBeGarbageCollected::internalFieldCount, |
+ V8TestInterfaceWillBeGarbageCollectedAttributes, WTF_ARRAY_LENGTH(V8TestInterfaceWillBeGarbageCollectedAttributes), |
0, 0, |
- V8TestInterfaceWillBeGarbageCollectedAccessors, WTF_ARRAY_LENGTH(V8TestInterfaceWillBeGarbageCollectedAccessors), |
0, 0); |
functionTemplate->SetCallHandler(V8TestInterfaceWillBeGarbageCollected::constructorCallback); |
functionTemplate->SetLength(1); |