| Index: Source/bindings/v8/V8DOMConfiguration.h
|
| diff --git a/Source/bindings/v8/V8DOMConfiguration.h b/Source/bindings/v8/V8DOMConfiguration.h
|
| index baa2cf6b1bf694f4546bb9d757c7443c0703843e..29f19583ad029d29621806b677a1f43c7da70a28 100644
|
| --- a/Source/bindings/v8/V8DOMConfiguration.h
|
| +++ b/Source/bindings/v8/V8DOMConfiguration.h
|
| @@ -69,25 +69,14 @@ public:
|
| v8::PropertyAttribute attribute;
|
| };
|
|
|
| - static void installAttributes(v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::ObjectTemplate>, const AttributeConfiguration*, size_t attributeCount, v8::Isolate*, WrapperWorldType currentWorldType);
|
| + static void installAttributes(v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::ObjectTemplate>, const AttributeConfiguration*, size_t attributeCount, v8::Isolate*);
|
|
|
| template<class ObjectOrTemplate>
|
| static inline void installAttribute(v8::Handle<ObjectOrTemplate> instanceTemplate, v8::Handle<ObjectOrTemplate> prototype, const AttributeConfiguration& attribute, v8::Isolate* isolate)
|
| {
|
| - (attribute.onPrototype ? prototype : instanceTemplate)->SetAccessor(v8::String::NewFromUtf8(isolate, attribute.name, v8::String::kInternalizedString),
|
| - attribute.getter,
|
| - attribute.setter,
|
| - v8::External::New(isolate, const_cast<WrapperTypeInfo*>(attribute.data)),
|
| - attribute.settings,
|
| - attribute.attribute);
|
| - }
|
| -
|
| - template<class ObjectOrTemplate>
|
| - static inline void installAttribute(v8::Handle<ObjectOrTemplate> instanceTemplate, v8::Handle<ObjectOrTemplate> prototype, const AttributeConfiguration& attribute, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| - {
|
| v8::AccessorGetterCallback getter = attribute.getter;
|
| v8::AccessorSetterCallback setter = attribute.setter;
|
| - if (currentWorldType == MainWorld) {
|
| + if (DOMWrapperWorld::current(isolate)->isMainWorld()) {
|
| if (attribute.getterForMainWorld)
|
| getter = attribute.getterForMainWorld;
|
| if (attribute.setterForMainWorld)
|
| @@ -120,15 +109,15 @@ public:
|
| int length;
|
| };
|
|
|
| - static void installCallbacks(v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::Signature>, v8::PropertyAttribute, const MethodConfiguration*, size_t callbackCount, v8::Isolate*, WrapperWorldType);
|
| + static void installCallbacks(v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::Signature>, v8::PropertyAttribute, const MethodConfiguration*, size_t callbackCount, v8::Isolate*);
|
|
|
| - static void installAccessors(v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::Signature>, const AccessorConfiguration*, size_t accessorCount, v8::Isolate*, WrapperWorldType);
|
| + static void installAccessors(v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::Signature>, const AccessorConfiguration*, size_t accessorCount, v8::Isolate*);
|
|
|
| static v8::Local<v8::Signature> installDOMClassTemplate(v8::Handle<v8::FunctionTemplate>, const char* interfaceName, v8::Handle<v8::FunctionTemplate> parentClass, size_t fieldCount,
|
| const AttributeConfiguration*, size_t attributeCount,
|
| const AccessorConfiguration*, size_t accessorCount,
|
| const MethodConfiguration*, size_t callbackCount,
|
| - v8::Isolate*, WrapperWorldType);
|
| + v8::Isolate*);
|
| };
|
|
|
| } // namespace WebCore
|
|
|