diff options
Diffstat (limited to 'WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp b/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp index a6e41a1..13c82f3 100644 --- a/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp +++ b/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp @@ -35,17 +35,15 @@ #include "V8Binding.h" #include "V8CustomBinding.h" +#include "V8NPObject.h" #include "V8Proxy.h" -// FIXME: The name of this file will change once refactoring is complete -#include "v8_npobject.h" - namespace WebCore { NAMED_PROPERTY_GETTER(HTMLPlugInElement) { INC_STATS("DOM.HTMLPlugInElement.NamedPropertyGetter"); - HTMLPlugInElement* imp = V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder()); + HTMLPlugInElement* imp = V8DOMWrapper::convertDOMWrapperToNode<HTMLPlugInElement>(info.Holder()); ScriptInstance scriptInstance = imp->getInstance(); if (!scriptInstance) return notHandledByInterceptor(); @@ -54,13 +52,13 @@ NAMED_PROPERTY_GETTER(HTMLPlugInElement) if (instance.IsEmpty()) return notHandledByInterceptor(); - return NPObjectGetNamedProperty(instance, name); + return npObjectGetNamedProperty(instance, name); } NAMED_PROPERTY_SETTER(HTMLPlugInElement) { INC_STATS("DOM.HTMLPlugInElement.NamedPropertySetter"); - HTMLPlugInElement* imp = V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder()); + HTMLPlugInElement* imp = V8DOMWrapper::convertDOMWrapperToNode<HTMLPlugInElement>(info.Holder()); ScriptInstance scriptInstance = imp->getInstance(); if (!scriptInstance) return notHandledByInterceptor(); @@ -69,19 +67,19 @@ NAMED_PROPERTY_SETTER(HTMLPlugInElement) if (instance.IsEmpty()) return notHandledByInterceptor(); - return NPObjectSetNamedProperty(instance, name, value); + return npObjectSetNamedProperty(instance, name, value); } CALLBACK_FUNC_DECL(HTMLPlugInElement) { INC_STATS("DOM.HTMLPluginElement()"); - return NPObjectInvokeDefaultHandler(args); + return npObjectInvokeDefaultHandler(args); } INDEXED_PROPERTY_GETTER(HTMLPlugInElement) { INC_STATS("DOM.HTMLPlugInElement.IndexedPropertyGetter"); - HTMLPlugInElement* imp = V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder()); + HTMLPlugInElement* imp = V8DOMWrapper::convertDOMWrapperToNode<HTMLPlugInElement>(info.Holder()); ScriptInstance scriptInstance = imp->getInstance(); if (!scriptInstance) return notHandledByInterceptor(); @@ -90,13 +88,13 @@ INDEXED_PROPERTY_GETTER(HTMLPlugInElement) if (instance.IsEmpty()) return notHandledByInterceptor(); - return NPObjectGetIndexedProperty(instance, index); + return npObjectGetIndexedProperty(instance, index); } INDEXED_PROPERTY_SETTER(HTMLPlugInElement) { INC_STATS("DOM.HTMLPlugInElement.IndexedPropertySetter"); - HTMLPlugInElement* imp = V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder()); + HTMLPlugInElement* imp = V8DOMWrapper::convertDOMWrapperToNode<HTMLPlugInElement>(info.Holder()); ScriptInstance scriptInstance = imp->getInstance(); if (!scriptInstance) return notHandledByInterceptor(); @@ -105,7 +103,7 @@ INDEXED_PROPERTY_SETTER(HTMLPlugInElement) if (instance.IsEmpty()) return notHandledByInterceptor(); - return NPObjectSetIndexedProperty(instance, index, value); + return npObjectSetIndexedProperty(instance, index, value); } } // namespace WebCore |