1 files changed, 19 insertions, 18 deletions

diff --git a/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp b/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp
index 1ad7d4a..fd0305a 100644
--- a/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "XSLTProcessor.h"
+#include "V8XSLTProcessor.h"
 
 #include "Document.h"
 #include "DocumentFragment.h"
@@ -40,57 +40,58 @@
 #include "V8Document.h"
 #include "V8Node.h"
 #include "V8Proxy.h"
+#include "XSLTProcessor.h"
 
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-CALLBACK_FUNC_DECL(XSLTProcessorConstructor)
+v8::Handle<v8::Value> V8XSLTProcessor::constructorCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.Constructor");
     return V8Proxy::constructDOMObject<V8ClassIndex::XSLTPROCESSOR, XSLTProcessor>(args);
 }
 
 
-CALLBACK_FUNC_DECL(XSLTProcessorImportStylesheet)
+v8::Handle<v8::Value> V8XSLTProcessor::importStylesheetCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.importStylesheet");
     if (!V8Node::HasInstance(args[0]))
         return v8::Undefined();
 
-    XSLTProcessor* imp = V8DOMWrapper::convertToNativeObject<XSLTProcessor>(V8ClassIndex::XSLTPROCESSOR, args.Holder());
+    XSLTProcessor* imp = V8XSLTProcessor::toNative(args.Holder());
 
-    Node* node = V8DOMWrapper::convertDOMWrapperToNode<Node>(v8::Handle<v8::Object>::Cast(args[0]));
+    Node* node = V8Node::toNative(v8::Handle<v8::Object>::Cast(args[0]));
     imp->importStylesheet(node);
     return v8::Undefined();
 }
 
 
-CALLBACK_FUNC_DECL(XSLTProcessorTransformToFragment)
+v8::Handle<v8::Value> V8XSLTProcessor::transformToFragmentCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.transformToFragment");
     if (!V8Node::HasInstance(args[0]) || !V8Document::HasInstance(args[1]))
         return v8::Undefined();
 
-    XSLTProcessor* imp = V8DOMWrapper::convertToNativeObject<XSLTProcessor>(V8ClassIndex::XSLTPROCESSOR, args.Holder());
+    XSLTProcessor* imp = V8XSLTProcessor::toNative(args.Holder());
 
-    Node* source = V8DOMWrapper::convertDOMWrapperToNode<Node>(v8::Handle<v8::Object>::Cast(args[0]));
-    Document* owner = V8DOMWrapper::convertDOMWrapperToNode<Document>(v8::Handle<v8::Object>::Cast(args[1]));
+    Node* source = V8Node::toNative(v8::Handle<v8::Object>::Cast(args[0]));
+    Document* owner = V8Document::toNative(v8::Handle<v8::Object>::Cast(args[1]));
     RefPtr<DocumentFragment> result = imp->transformToFragment(source, owner);
     return V8DOMWrapper::convertNodeToV8Object(result.release());
 }
 
 
-CALLBACK_FUNC_DECL(XSLTProcessorTransformToDocument)
+v8::Handle<v8::Value> V8XSLTProcessor::transformToDocumentCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.transformToDocument");
 
     if (!V8Node::HasInstance(args[0]))
         return v8::Undefined();
 
-    XSLTProcessor* imp = V8DOMWrapper::convertToNativeObject<XSLTProcessor>(V8ClassIndex::XSLTPROCESSOR, args.Holder());
+    XSLTProcessor* imp = V8XSLTProcessor::toNative(args.Holder());
 
-    Node* source = V8DOMWrapper::convertDOMWrapperToNode<Node>(v8::Handle<v8::Object>::Cast(args[0]));
+    Node* source = V8Node::toNative(v8::Handle<v8::Object>::Cast(args[0]));
     if (!source)
         return v8::Undefined();
 
@@ -102,13 +103,13 @@ CALLBACK_FUNC_DECL(XSLTProcessorTransformToDocument)
 }
 
 
-CALLBACK_FUNC_DECL(XSLTProcessorSetParameter)
+v8::Handle<v8::Value> V8XSLTProcessor::setParameterCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.setParameter");
     if (isUndefinedOrNull(args[1]) || isUndefinedOrNull(args[2]))
         return v8::Undefined();
 
-    XSLTProcessor* imp = V8DOMWrapper::convertToNativeObject<XSLTProcessor>(V8ClassIndex::XSLTPROCESSOR, args.Holder());
+    XSLTProcessor* imp = V8XSLTProcessor::toNative(args.Holder());
 
     String namespaceURI = toWebCoreString(args[0]);
     String localName = toWebCoreString(args[1]);
@@ -119,13 +120,13 @@ CALLBACK_FUNC_DECL(XSLTProcessorSetParameter)
 }
 
 
-CALLBACK_FUNC_DECL(XSLTProcessorGetParameter)
+v8::Handle<v8::Value> V8XSLTProcessor::getParameterCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.getParameter");
     if (isUndefinedOrNull(args[1]))
         return v8::Undefined();
 
-    XSLTProcessor* imp = V8DOMWrapper::convertToNativeObject<XSLTProcessor>(V8ClassIndex::XSLTPROCESSOR, args.Holder());
+    XSLTProcessor* imp = V8XSLTProcessor::toNative(args.Holder());
 
     String namespaceURI = toWebCoreString(args[0]);
     String localName = toWebCoreString(args[1]);
@@ -136,13 +137,13 @@ CALLBACK_FUNC_DECL(XSLTProcessorGetParameter)
     return v8String(result);
 }
 
-CALLBACK_FUNC_DECL(XSLTProcessorRemoveParameter)
+v8::Handle<v8::Value> V8XSLTProcessor::removeParameterCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.XSLTProcessor.removeParameter");
     if (isUndefinedOrNull(args[1]))
         return v8::Undefined();
 
-    XSLTProcessor* imp = V8DOMWrapper::convertToNativeObject<XSLTProcessor>(V8ClassIndex::XSLTPROCESSOR, args.Holder());
+    XSLTProcessor* imp = V8XSLTProcessor::toNative(args.Holder());
 
     String namespaceURI = toWebCoreString(args[0]);
     String localName = toWebCoreString(args[1]);