| Index: Source/bindings/tests/results/V8TestInterface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestInterface.cpp b/Source/bindings/tests/results/V8TestInterface.cpp
|
| index e27c9b96f7cb174f7dc664642cd40fb0de648b48..320a2fbc1f68f4ef06dfdcebcb6c781fda65fd0f 100644
|
| --- a/Source/bindings/tests/results/V8TestInterface.cpp
|
| +++ b/Source/bindings/tests/results/V8TestInterface.cpp
|
| @@ -598,15 +598,14 @@ void V8TestInterface::namedPropertyQuery(v8::Local<v8::String> name, const v8::P
|
| TestInterface* collection = toNative(info.Holder());
|
| AtomicString propertyName = toWebCoreAtomicString(name);
|
| ExceptionCode ec = 0;
|
| - int returnValue = 0;
|
| - bool result = collection->namedPropertyQuery(propertyName, returnValue, ec);
|
| + bool result = collection->namedPropertyQuery(propertyName, ec);
|
| if (ec) {
|
| setDOMException(ec, info.GetIsolate());
|
| return;
|
| }
|
| if (!result)
|
| return;
|
| - v8SetReturnValueInt(info, 0);
|
| + v8SetReturnValueInt(info, v8::None);
|
| }
|
|
|
| static v8::Handle<v8::FunctionTemplate> ConfigureV8TestInterfaceTemplate(v8::Handle<v8::FunctionTemplate> desc, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| @@ -695,7 +694,7 @@ void V8TestInterface::installPerContextProperties(v8::Handle<v8::Object> instanc
|
| #if ENABLE(Condition11) || ENABLE(Condition12)
|
| if (ContextFeatures::condition16Enabled(impl->document()) && RuntimeEnabledFeatures::condition15Enabled()) {
|
| static const V8DOMConfiguration::BatchedAttribute attrData =\
|
| - // Attribute 'Node15' (Type: 'attribute' ExtAttr: 'EnabledPerContext EnabledAtRuntime Conditional ImplementedBy')
|
| + // Attribute 'Node15'
|
| {"Node15", TestInterfaceV8Internal::Node15AttrGetterCallback, TestInterfaceV8Internal::Node15AttrSetterCallback, 0, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */};
|
| V8DOMConfiguration::configureAttribute(instance, proto, attrData, isolate);
|
| }
|
| @@ -716,7 +715,6 @@ v8::Handle<v8::Object> V8TestInterface::createWrapper(PassRefPtr<TestInterface>
|
| v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
|
| if (UNLIKELY(wrapper.IsEmpty()))
|
| return wrapper;
|
| -
|
| installPerContextProperties(wrapper, impl.get(), isolate);
|
| V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent);
|
| return wrapper;
|
|
|