diff options
Diffstat (limited to 'webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp')
-rw-r--r-- | webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp b/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp index ce4c84d..d61a8c32 100644 --- a/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp +++ b/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp @@ -107,9 +107,9 @@ ACCESSOR_GETTER(XMLHttpRequestOnabort) { INC_STATS(L"DOM.XMLHttpRequest.onabort._get"); XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); - if (imp->onAbortListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onAbortListener()); + if (imp->onabort()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onabort()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -121,24 +121,24 @@ ACCESSOR_SETTER(XMLHttpRequestOnabort) { XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); if (value->IsNull()) { - if (imp->onAbortListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onAbortListener()); + if (imp->onabort()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onabort()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnAbortListener(0); + imp->setOnabort(0); } else { V8Proxy* proxy = V8Proxy::retrieve(imp->document()->frame()); if (!proxy) return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnAbortListener(listener); + imp->setOnabort(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -148,9 +148,9 @@ ACCESSOR_GETTER(XMLHttpRequestOnerror) { INC_STATS(L"DOM.XMLHttpRequest.onerror._get"); XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); - if (imp->onErrorListener()) { - RefPtr<V8XHREventListener> listener = - static_cast<V8XHREventListener*>(imp->onErrorListener()); + if (imp->onerror()) { + RefPtr<V8ObjectEventListener> listener = + static_cast<V8ObjectEventListener*>(imp->onerror()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -162,24 +162,24 @@ ACCESSOR_SETTER(XMLHttpRequestOnerror) { XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); if (value->IsNull()) { - if (imp->onErrorListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onErrorListener()); + if (imp->onerror()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onerror()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnErrorListener(0); + imp->setOnerror(0); } else { V8Proxy* proxy = V8Proxy::retrieve(imp->document()->frame()); if (!proxy) return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnErrorListener(listener); + imp->setOnerror(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -189,9 +189,9 @@ ACCESSOR_GETTER(XMLHttpRequestOnload) { INC_STATS(L"DOM.XMLHttpRequest.onload._get"); XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); - if (imp->onLoadListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadListener()); + if (imp->onload()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onload()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -205,7 +205,7 @@ ACCESSOR_SETTER(XMLHttpRequestOnload) V8ClassIndex::XMLHTTPREQUEST, info.Holder()); if (value->IsNull()) { if (imp->onload()) { - V8XHREventListener* listener = static_cast<V8XHREventListener*>(imp->onload()); + V8ObjectEventListener* listener = static_cast<V8ObjectEventListener*>(imp->onload()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } @@ -218,7 +218,7 @@ ACCESSOR_SETTER(XMLHttpRequestOnload) return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { imp->setOnload(listener.get()); CreateHiddenXHRDependency(info.Holder(), value); @@ -230,9 +230,9 @@ ACCESSOR_GETTER(XMLHttpRequestOnloadstart) { INC_STATS(L"DOM.XMLHttpRequest.onloadstart._get"); XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); - if (imp->onLoadStartListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadStartListener()); + if (imp->onloadstart()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onloadstart()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -244,24 +244,24 @@ ACCESSOR_SETTER(XMLHttpRequestOnloadstart) { XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); if (value->IsNull()) { - if (imp->onLoadStartListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadStartListener()); + if (imp->onloadstart()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onloadstart()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnLoadStartListener(0); + imp->setOnloadstart(0); } else { V8Proxy* proxy = V8Proxy::retrieve(imp->document()->frame()); if (!proxy) return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnLoadStartListener(listener); + imp->setOnloadstart(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -271,9 +271,9 @@ ACCESSOR_GETTER(XMLHttpRequestOnprogress) { INC_STATS(L"DOM.XMLHttpRequest.onprogress._get"); XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); - if (imp->onProgressListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onProgressListener()); + if (imp->onprogress()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onprogress()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -285,24 +285,24 @@ ACCESSOR_SETTER(XMLHttpRequestOnprogress) { XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); if (value->IsNull()) { - if (imp->onProgressListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onProgressListener()); + if (imp->onprogress()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onprogress()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnProgressListener(0); + imp->setOnprogress(0); } else { V8Proxy* proxy = V8Proxy::retrieve(imp->document()->frame()); if (!proxy) return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnProgressListener(listener); + imp->setOnprogress(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -312,9 +312,9 @@ ACCESSOR_GETTER(XMLHttpRequestOnreadystatechange) { INC_STATS(L"DOM.XMLHttpRequest.onreadystatechange._get"); XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( V8ClassIndex::XMLHTTPREQUEST, info.Holder()); - if (imp->onReadyStateChangeListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onReadyStateChangeListener()); + if (imp->onreadystatechange()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onreadystatechange()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -328,8 +328,8 @@ ACCESSOR_SETTER(XMLHttpRequestOnreadystatechange) V8ClassIndex::XMLHTTPREQUEST, info.Holder()); if (value->IsNull()) { if (imp->onreadystatechange()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onreadystatechange()); + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onreadystatechange()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } @@ -342,7 +342,7 @@ ACCESSOR_SETTER(XMLHttpRequestOnreadystatechange) return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { imp->setOnreadystatechange(listener.get()); CreateHiddenXHRDependency(info.Holder(), value); @@ -361,7 +361,7 @@ CALLBACK_FUNC_DECL(XMLHttpRequestAddEventListener) return v8::Undefined(); RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(args[1], false); + proxy->FindOrCreateObjectEventListener(args[1], false); if (listener) { String type = ToWebCoreString(args[0]); bool useCapture = args[2]->BooleanValue(); @@ -382,7 +382,7 @@ CALLBACK_FUNC_DECL(XMLHttpRequestRemoveEventListener) { return v8::Undefined(); // probably leaked RefPtr<EventListener> listener = - proxy->FindXHREventListener(args[1], false); + proxy->FindObjectEventListener(args[1], false); if (listener) { String type = ToWebCoreString(args[0]); @@ -544,9 +544,9 @@ ACCESSOR_GETTER(XMLHttpRequestUploadOnabort) { INC_STATS(L"DOM.XMLHttpRequestUpload.onabort._get"); XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); - if (imp->onAbortListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onAbortListener()); + if (imp->onabort()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onabort()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -558,15 +558,15 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnabort) { XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); if (value->IsNull()) { - if (imp->onAbortListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onAbortListener()); + if (imp->onabort()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onabort()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnAbortListener(0); + imp->setOnabort(0); } else { XMLHttpRequest* xmlhttprequest = imp->associatedXMLHttpRequest(); V8Proxy* proxy = V8Proxy::retrieve(xmlhttprequest->document()->frame()); @@ -574,9 +574,9 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnabort) { return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnAbortListener(listener); + imp->setOnabort(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -586,9 +586,9 @@ ACCESSOR_GETTER(XMLHttpRequestUploadOnerror) { INC_STATS(L"DOM.XMLHttpRequestUpload.onerror._get"); XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); - if (imp->onErrorListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onErrorListener()); + if (imp->onerror()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onerror()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -600,15 +600,15 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnerror) { XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); if (value->IsNull()) { - if (imp->onErrorListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onErrorListener()); + if (imp->onerror()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onerror()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnErrorListener(0); + imp->setOnerror(0); } else { XMLHttpRequest* xmlhttprequest = imp->associatedXMLHttpRequest(); V8Proxy* proxy = V8Proxy::retrieve(xmlhttprequest->document()->frame()); @@ -616,9 +616,9 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnerror) { return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnErrorListener(listener); + imp->setOnerror(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -628,9 +628,9 @@ ACCESSOR_GETTER(XMLHttpRequestUploadOnload) { INC_STATS(L"DOM.XMLHttpRequestUpload.onload._get"); XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); - if (imp->onLoadListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadListener()); + if (imp->onload()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onload()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -642,15 +642,15 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnload) { XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); if (value->IsNull()) { - if (imp->onLoadListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadListener()); + if (imp->onload()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onload()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnLoadListener(0); + imp->setOnload(0); } else { XMLHttpRequest* xmlhttprequest = imp->associatedXMLHttpRequest(); V8Proxy* proxy = V8Proxy::retrieve(xmlhttprequest->document()->frame()); @@ -658,9 +658,9 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnload) { return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnLoadListener(listener); + imp->setOnload(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -670,9 +670,9 @@ ACCESSOR_GETTER(XMLHttpRequestUploadOnloadstart) { INC_STATS(L"DOM.XMLHttpRequestUpload.onloadstart._get"); XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); - if (imp->onLoadStartListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadStartListener()); + if (imp->onloadstart()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onloadstart()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -684,15 +684,15 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnloadstart) { XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); if (value->IsNull()) { - if (imp->onLoadStartListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onLoadStartListener()); + if (imp->onloadstart()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onloadstart()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnLoadStartListener(0); + imp->setOnloadstart(0); } else { XMLHttpRequest* xmlhttprequest = imp->associatedXMLHttpRequest(); V8Proxy* proxy = V8Proxy::retrieve(xmlhttprequest->document()->frame()); @@ -700,9 +700,9 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnloadstart) { return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnLoadStartListener(listener); + imp->setOnloadstart(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -712,9 +712,9 @@ ACCESSOR_GETTER(XMLHttpRequestUploadOnprogress) { INC_STATS(L"DOM.XMLHttpRequestUpload.onprogress._get"); XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); - if (imp->onProgressListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onProgressListener()); + if (imp->onprogress()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onprogress()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); return v8_listener; } @@ -726,15 +726,15 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnprogress) { XMLHttpRequestUpload* imp = V8Proxy::ToNativeObject<XMLHttpRequestUpload>( V8ClassIndex::XMLHTTPREQUESTUPLOAD, info.Holder()); if (value->IsNull()) { - if (imp->onProgressListener()) { - V8XHREventListener* listener = - static_cast<V8XHREventListener*>(imp->onProgressListener()); + if (imp->onprogress()) { + V8ObjectEventListener* listener = + static_cast<V8ObjectEventListener*>(imp->onprogress()); v8::Local<v8::Object> v8_listener = listener->GetListenerObject(); RemoveHiddenXHRDependency(info.Holder(), v8_listener); } // Clear the listener - imp->setOnProgressListener(0); + imp->setOnprogress(0); } else { XMLHttpRequest* xmlhttprequest = imp->associatedXMLHttpRequest(); V8Proxy* proxy = V8Proxy::retrieve(xmlhttprequest->document()->frame()); @@ -742,9 +742,9 @@ ACCESSOR_SETTER(XMLHttpRequestUploadOnprogress) { return; RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(value, false); + proxy->FindOrCreateObjectEventListener(value, false); if (listener) { - imp->setOnProgressListener(listener); + imp->setOnprogress(listener); CreateHiddenXHRDependency(info.Holder(), value); } } @@ -761,7 +761,7 @@ CALLBACK_FUNC_DECL(XMLHttpRequestUploadAddEventListener) { return v8::Undefined(); RefPtr<EventListener> listener = - proxy->FindOrCreateXHREventListener(args[1], false); + proxy->FindOrCreateObjectEventListener(args[1], false); if (listener) { String type = ToWebCoreString(args[0]); bool useCapture = args[2]->BooleanValue(); @@ -783,7 +783,7 @@ CALLBACK_FUNC_DECL(XMLHttpRequestUploadRemoveEventListener) { return v8::Undefined(); // probably leaked RefPtr<EventListener> listener = - proxy->FindXHREventListener(args[1], false); + proxy->FindObjectEventListener(args[1], false); if (listener) { String type = ToWebCoreString(args[0]); |