1 files changed, 12 insertions, 12 deletions
diff --git a/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp b/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp
index 9f0d25e..02c3499 100644
--- a/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp
@@ -46,7 +46,7 @@ namespace WebCore {
 CALLBACK_FUNC_DECL(HTMLOptionsCollectionRemove)
 {
     INC_STATS("DOM.HTMLOptionsCollection.remove()");
-    HTMLOptionsCollection* imp = V8Proxy::ToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, args.Holder());
+    HTMLOptionsCollection* imp = V8DOMWrapper::convertToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, args.Holder());
     HTMLSelectElement* base = static_cast<HTMLSelectElement*>(imp->base());
     return removeElement(base, args);
 }
@@ -55,11 +55,11 @@ CALLBACK_FUNC_DECL(HTMLOptionsCollectionAdd)
 {
     INC_STATS("DOM.HTMLOptionsCollection.add()");
     if (!V8HTMLOptionElement::HasInstance(args[0])) {
-        V8Proxy::SetDOMException(TYPE_MISMATCH_ERR);
+        V8Proxy::setDOMException(TYPE_MISMATCH_ERR);
         return v8::Undefined();
     }
-    HTMLOptionsCollection* imp = V8Proxy::ToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, args.Holder());
-    HTMLOptionElement* option = V8Proxy::DOMWrapperToNode<HTMLOptionElement>(args[0]);
+    HTMLOptionsCollection* imp = V8DOMWrapper::convertToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, args.Holder());
+    HTMLOptionElement* option = V8DOMWrapper::convertDOMWrapperToNode<HTMLOptionElement>(v8::Handle<v8::Object>(v8::Handle<v8::Object>::Cast(args[0])));
 
     ExceptionCode ec = 0;
     if (args.Length() < 2)
@@ -67,7 +67,7 @@ CALLBACK_FUNC_DECL(HTMLOptionsCollectionAdd)
     else {
         bool ok;
         v8::TryCatch try_catch;
-        int index = ToInt32(args[1], ok);
+        int index = toInt32(args[1], ok);
 
         if (try_catch.HasCaught())
             return v8::Undefined();
@@ -79,7 +79,7 @@ CALLBACK_FUNC_DECL(HTMLOptionsCollectionAdd)
     }
 
     if (ec != 0)
-        V8Proxy::SetDOMException(ec);
+        V8Proxy::setDOMException(ec);
 
     return v8::Undefined();
 }
@@ -87,7 +87,7 @@ CALLBACK_FUNC_DECL(HTMLOptionsCollectionAdd)
 ACCESSOR_GETTER(HTMLOptionsCollectionLength)
 {
     INC_STATS("DOM.HTMLOptionsCollection.length._get");
-    HTMLOptionsCollection* imp = V8Proxy::ToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
+    HTMLOptionsCollection* imp = V8DOMWrapper::convertToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
     int v = imp->length();
     return v8::Integer::New(v);
 }
@@ -95,7 +95,7 @@ ACCESSOR_GETTER(HTMLOptionsCollectionLength)
 ACCESSOR_SETTER(HTMLOptionsCollectionLength)
 {
     INC_STATS("DOM.HTMLOptionsCollection.length._set");
-    HTMLOptionsCollection* imp = V8Proxy::ToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
+    HTMLOptionsCollection* imp = V8DOMWrapper::convertToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
     double v = value->NumberValue();
     unsigned newLength = 0;
     ExceptionCode ec = 0;
@@ -110,25 +110,25 @@ ACCESSOR_SETTER(HTMLOptionsCollectionLength)
     if (!ec)
         imp->setLength(value->Uint32Value(), ec);
 
-    V8Proxy::SetDOMException(ec);
+    V8Proxy::setDOMException(ec);
 }
 
 INDEXED_PROPERTY_GETTER(HTMLOptionsCollection)
 {
     INC_STATS("DOM.HTMLOptionsCollection.IndexedPropertyGetter");
-    HTMLOptionsCollection* collection = V8Proxy::ToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
+    HTMLOptionsCollection* collection = V8DOMWrapper::convertToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
 
     RefPtr<Node> result = collection->item(index);
     if (!result)
         return notHandledByInterceptor();
 
-    return V8Proxy::NodeToV8Object(result.get());
+    return V8DOMWrapper::convertNodeToV8Object(result.release());
 }
 
 INDEXED_PROPERTY_SETTER(HTMLOptionsCollection)
 {
     INC_STATS("DOM.HTMLOptionsCollection.IndexedPropertySetter");
-    HTMLOptionsCollection* collection = V8Proxy::ToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
+    HTMLOptionsCollection* collection = V8DOMWrapper::convertToNativeObject<HTMLOptionsCollection>(V8ClassIndex::HTMLOPTIONSCOLLECTION, info.Holder());
     HTMLSelectElement* base = static_cast<HTMLSelectElement*>(collection->base());
     return toOptionsCollectionSetter(index, value, base);
 }