| Index: Source/bindings/tests/results/V8TestInterface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestInterface.cpp b/Source/bindings/tests/results/V8TestInterface.cpp
|
| index 564402da84d0a5f17c6ea3f37f21716ec8cfa492..f5c8a9011356c6cce8b0bfeca42df8c358c473cf 100644
|
| --- a/Source/bindings/tests/results/V8TestInterface.cpp
|
| +++ b/Source/bindings/tests/results/V8TestInterface.cpp
|
| @@ -19,13 +19,14 @@
|
| */
|
|
|
| #include "config.h"
|
| -#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition1) || ENABLE(Condition2)
|
| #include "V8TestInterface.h"
|
|
|
| #include "BindingState.h"
|
| #include "ContextFeatures.h"
|
| #include "ExceptionCode.h"
|
| #include "ScriptController.h"
|
| +#include "TestPartialInterface.h"
|
| #include "V8Binding.h"
|
| #include "V8DOMWrapper.h"
|
| #include "V8Node.h"
|
| @@ -87,125 +88,207 @@ void initializeScriptWrappableForInterface(TestInterface* object)
|
| #if defined(OS_WIN)
|
| namespace WebCore {
|
| #endif
|
| -WrapperTypeInfo V8TestInterface::info = { V8TestInterface::GetTemplate, V8TestInterface::derefObject, 0, 0, 0, V8TestInterface::installPerContextPrototypeProperties, 0, WrapperTypeObjectPrototype };
|
| +WrapperTypeInfo V8TestInterface::info = { V8TestInterface::GetTemplate, V8TestInterface::derefObject, V8TestInterface::toActiveDOMObject, 0, 0, V8TestInterface::installPerContextPrototypeProperties, 0, WrapperTypeObjectPrototype };
|
|
|
| namespace TestInterfaceV8Internal {
|
|
|
| template <typename T> void V8_USE(T) { }
|
|
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStaticReadOnlyAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| - return v8Integer(TestInterface::supplementalStaticReadOnlyAttr(), info.GetIsolate());
|
| + return v8Integer(TestPartialInterface::supplementalStaticReadOnlyAttr(), info.GetIsolate());
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStaticReadOnlyAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| return TestInterfaceV8Internal::supplementalStaticReadOnlyAttrAttrGetter(name, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStaticAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| - return v8String(TestInterface::supplementalStaticAttr(), info.GetIsolate(), ReturnUnsafeHandle);
|
| + return v8String(TestPartialInterface::supplementalStaticAttr(), info.GetIsolate(), ReturnUnsafeHandle);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStaticAttrAttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| return TestInterfaceV8Internal::supplementalStaticAttrAttrGetter(name, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalStaticAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, v, value);
|
| - TestInterface::setSupplementalStaticAttr(v);
|
| + TestPartialInterface::setSupplementalStaticAttr(v);
|
| return;
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalStaticAttrAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| TestInterfaceV8Internal::supplementalStaticAttrAttrSetter(name, value, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStr1AttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| TestInterface* imp = V8TestInterface::toNative(info.Holder());
|
| - return v8String(imp->supplementalStr1(), info.GetIsolate(), ReturnUnsafeHandle);
|
| + return v8String(TestPartialInterface::supplementalStr1(imp), info.GetIsolate(), ReturnUnsafeHandle);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStr1AttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| return TestInterfaceV8Internal::supplementalStr1AttrGetter(name, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStr2AttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| TestInterface* imp = V8TestInterface::toNative(info.Holder());
|
| - return v8String(imp->supplementalStr2(), info.GetIsolate(), ReturnUnsafeHandle);
|
| + return v8String(TestPartialInterface::supplementalStr2(imp), info.GetIsolate(), ReturnUnsafeHandle);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStr2AttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| return TestInterfaceV8Internal::supplementalStr2AttrGetter(name, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalStr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| TestInterface* imp = V8TestInterface::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, v, value);
|
| - imp->setSupplementalStr2(v);
|
| + TestPartialInterface::setSupplementalStr2(imp, v);
|
| return;
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalStr2AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| TestInterfaceV8Internal::supplementalStr2AttrSetter(name, value, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalStr3AttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| return V8TestInterface::supplementalStr3AttrGetterCustom(name, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalStr3AttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| V8TestInterface::supplementalStr3AttrSetterCustom(name, value, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalNodeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| TestInterface* imp = V8TestInterface::toNative(info.Holder());
|
| - return toV8Fast(imp->supplementalNode(), info, imp);
|
| + return toV8Fast(TestPartialInterface::supplementalNode(imp), info, imp);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalNodeAttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
|
| {
|
| return TestInterfaceV8Internal::supplementalNodeAttrGetter(name, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalNodeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| TestInterface* imp = V8TestInterface::toNative(info.Holder());
|
| V8TRYCATCH_VOID(Node*, v, V8Node::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
|
| - imp->setSupplementalNode(WTF::getPtr(v));
|
| + TestPartialInterface::setSupplementalNode(imp, WTF::getPtr(v));
|
| return;
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static void supplementalNodeAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
|
| {
|
| TestInterfaceV8Internal::supplementalNodeAttrSetter(name, value, info);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod1Method(const v8::Arguments& args)
|
| {
|
| TestInterface* imp = V8TestInterface::toNative(args.Holder());
|
| - imp->supplementalMethod1();
|
| + TestPartialInterface::supplementalMethod1(imp);
|
| return v8Undefined();
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod1MethodCallback(const v8::Arguments& args)
|
| {
|
| return TestInterfaceV8Internal::supplementalMethod1Method(args);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod2Method(const v8::Arguments& args)
|
| {
|
| if (args.Length() < 2)
|
| @@ -216,7 +299,7 @@ static v8::Handle<v8::Value> supplementalMethod2Method(const v8::Arguments& args
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<>, strArg, args[0]);
|
| V8TRYCATCH(TestObj*, objArg, V8TestObj::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
|
| ScriptExecutionContext* scriptContext = getScriptExecutionContext();
|
| - RefPtr<TestObj> result = imp->supplementalMethod2(scriptContext, strArg, objArg, ec);
|
| + RefPtr<TestObj> result = TestPartialInterface::supplementalMethod2(scriptContext, imp, strArg, objArg, ec);
|
| if (UNLIKELY(ec))
|
| goto fail;
|
| return toV8(result.release(), args.Holder(), args.GetIsolate());
|
| @@ -225,57 +308,132 @@ static v8::Handle<v8::Value> supplementalMethod2Method(const v8::Arguments& args
|
| return setDOMException(ec, args.GetIsolate());
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod2MethodCallback(const v8::Arguments& args)
|
| {
|
| return TestInterfaceV8Internal::supplementalMethod2Method(args);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod3MethodCallback(const v8::Arguments& args)
|
| {
|
| return V8TestInterface::supplementalMethod3MethodCustom(args);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod4Method(const v8::Arguments& args)
|
| {
|
| - TestInterface::supplementalMethod4();
|
| + TestPartialInterface::supplementalMethod4();
|
| return v8Undefined();
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| static v8::Handle<v8::Value> supplementalMethod4MethodCallback(const v8::Arguments& args)
|
| {
|
| return TestInterfaceV8Internal::supplementalMethod4Method(args);
|
| }
|
|
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +
|
| +static v8::Handle<v8::Value> constructor(const v8::Arguments& args)
|
| +{
|
| + if (args.Length() < 1)
|
| + return throwNotEnoughArgumentsError(args.GetIsolate());
|
| +
|
| + ExceptionCode ec = 0;
|
| + V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<>, str1, args[0]);
|
| + V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<>, str2, args[1]);
|
| +
|
| + ScriptExecutionContext* context = getScriptExecutionContext();
|
| +
|
| + RefPtr<TestInterface> impl = TestInterface::create(context, str1, str2, ec);
|
| + v8::Handle<v8::Object> wrapper = args.Holder();
|
| + if (ec)
|
| + goto fail;
|
| +
|
| + V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8TestInterface::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
|
| + return wrapper;
|
| + fail:
|
| + return setDOMException(ec, args.GetIsolate());
|
| +}
|
| +
|
| } // namespace TestInterfaceV8Internal
|
|
|
| static const V8DOMConfiguration::BatchedAttribute V8TestInterfaceAttrs[] = {
|
| - // Attribute 'supplementalStaticReadOnlyAttr' (Type: 'readonly attribute' ExtAttr: '')
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| + // Attribute 'supplementalStaticReadOnlyAttr' (Type: 'readonly attribute' ExtAttr: 'Conditional ImplementedBy')
|
| {"supplementalStaticReadOnlyAttr", TestInterfaceV8Internal::supplementalStaticReadOnlyAttrAttrGetterCallback, 0, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| - // Attribute 'supplementalStaticAttr' (Type: 'attribute' ExtAttr: '')
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| + // Attribute 'supplementalStaticAttr' (Type: 'attribute' ExtAttr: 'Conditional ImplementedBy')
|
| {"supplementalStaticAttr", TestInterfaceV8Internal::supplementalStaticAttrAttrGetterCallback, TestInterfaceV8Internal::supplementalStaticAttrAttrSetterCallback, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| - // Attribute 'supplementalStr1' (Type: 'readonly attribute' ExtAttr: '')
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| + // Attribute 'supplementalStr1' (Type: 'readonly attribute' ExtAttr: 'Conditional ImplementedBy')
|
| {"supplementalStr1", TestInterfaceV8Internal::supplementalStr1AttrGetterCallback, 0, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| - // Attribute 'supplementalStr2' (Type: 'attribute' ExtAttr: '')
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| + // Attribute 'supplementalStr2' (Type: 'attribute' ExtAttr: 'Conditional ImplementedBy')
|
| {"supplementalStr2", TestInterfaceV8Internal::supplementalStr2AttrGetterCallback, TestInterfaceV8Internal::supplementalStr2AttrSetterCallback, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| - // Attribute 'supplementalStr3' (Type: 'attribute' ExtAttr: 'CustomSetter CustomGetter')
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| + // Attribute 'supplementalStr3' (Type: 'attribute' ExtAttr: 'CustomSetter CustomGetter Conditional ImplementedBy')
|
| {"supplementalStr3", TestInterfaceV8Internal::supplementalStr3AttrGetterCallback, TestInterfaceV8Internal::supplementalStr3AttrSetterCallback, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| - // Attribute 'supplementalNode' (Type: 'attribute' ExtAttr: '')
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| + // Attribute 'supplementalNode' (Type: 'attribute' ExtAttr: 'Conditional ImplementedBy')
|
| {"supplementalNode", TestInterfaceV8Internal::supplementalNodeAttrGetterCallback, TestInterfaceV8Internal::supplementalNodeAttrSetterCallback, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| };
|
|
|
| static const V8DOMConfiguration::BatchedMethod V8TestInterfaceMethods[] = {
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| {"supplementalMethod1", TestInterfaceV8Internal::supplementalMethod1MethodCallback, 0, 0},
|
| +#endif
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| {"supplementalMethod3", TestInterfaceV8Internal::supplementalMethod3MethodCallback, 0, 0},
|
| +#endif
|
| };
|
|
|
| static const V8DOMConfiguration::BatchedConstant V8TestInterfaceConsts[] = {
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| {"SUPPLEMENTALCONSTANT1", 1},
|
| +#endif
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| {"SUPPLEMENTALCONSTANT2", 2},
|
| +#endif
|
| };
|
|
|
|
|
| -COMPILE_ASSERT(1 == TestInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEnumSUPPLEMENTALCONSTANT1IsWrongUseDoNotCheckConstants);
|
| -COMPILE_ASSERT(2 == TestInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +COMPILE_ASSERT(1 == TestPartialInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEnumSUPPLEMENTALCONSTANT1IsWrongUseDoNotCheckConstants);
|
| +#endif
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| +COMPILE_ASSERT(2 == TestPartialInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
|
| +#endif
|
| +
|
| +v8::Handle<v8::Value> V8TestInterface::constructorCallback(const v8::Arguments& args)
|
| +{
|
| + if (!args.IsConstructCall())
|
| + return throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
|
| +
|
| + if (ConstructorMode::current() == ConstructorMode::WrapExistingObject)
|
| + return args.Holder();
|
| +
|
| + return TestInterfaceV8Internal::constructor(args);
|
| +}
|
|
|
| static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestInterfaceTemplate(v8::Persistent<v8::FunctionTemplate> desc, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| {
|
| @@ -286,6 +444,8 @@ static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestInterfaceTemplate(v8:
|
| V8TestInterfaceAttrs, WTF_ARRAY_LENGTH(V8TestInterfaceAttrs),
|
| V8TestInterfaceMethods, WTF_ARRAY_LENGTH(V8TestInterfaceMethods), isolate, currentWorldType);
|
| UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
|
| + desc->SetCallHandler(V8TestInterface::constructorCallback);
|
| + desc->SetLength(1);
|
| v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
|
| v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
|
| UNUSED_PARAM(instance); // In some cases, it will not be used.
|
| @@ -295,8 +455,12 @@ static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestInterfaceTemplate(v8:
|
| const int supplementalMethod2Argc = 2;
|
| v8::Handle<v8::FunctionTemplate> supplementalMethod2Argv[supplementalMethod2Argc] = { v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info, currentWorldType) };
|
| v8::Handle<v8::Signature> supplementalMethod2Signature = v8::Signature::New(desc, supplementalMethod2Argc, supplementalMethod2Argv);
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| proto->Set(v8::String::NewSymbol("supplementalMethod2"), v8::FunctionTemplate::New(TestInterfaceV8Internal::supplementalMethod2MethodCallback, v8Undefined(), supplementalMethod2Signature, 2));
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#if ENABLE(Condition11) || ENABLE(Condition12)
|
| desc->Set(v8::String::NewSymbol("supplementalMethod4"), v8::FunctionTemplate::New(TestInterfaceV8Internal::supplementalMethod4MethodCallback, v8Undefined(), v8::Local<v8::Signature>(), 0));
|
| +#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| V8DOMConfiguration::batchConfigureConstants(desc, proto, V8TestInterfaceConsts, WTF_ARRAY_LENGTH(V8TestInterfaceConsts), isolate);
|
|
|
| // Custom toString template
|
| @@ -330,6 +494,11 @@ bool V8TestInterface::HasInstanceInAnyWorld(v8::Handle<v8::Value> value, v8::Iso
|
| || V8PerIsolateData::from(isolate)->hasInstance(&info, value, WorkerWorld);
|
| }
|
|
|
| +ActiveDOMObject* V8TestInterface::toActiveDOMObject(v8::Handle<v8::Object> object)
|
| +{
|
| + return toNative(object);
|
| +}
|
| +
|
|
|
| v8::Handle<v8::Object> V8TestInterface::createWrapper(PassRefPtr<TestInterface> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| {
|
| @@ -355,4 +524,4 @@ void V8TestInterface::derefObject(void* object)
|
|
|
| } // namespace WebCore
|
|
|
| -#endif // ENABLE(Condition11) || ENABLE(Condition12)
|
| +#endif // ENABLE(Condition1) || ENABLE(Condition2)
|
|
|