mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixing bug 232493. Paving the way for DOM Level 3 LS. This is mostly cleanup that will make life easier (and safer) when implementing DOM LS. r=caillon@aillon.org, sr=peterv@propagandism.org

This commit is contained in:
jst%mozilla.jstenback.com 2006-04-20 03:38:50 +00:00
Родитель ca4a979559
Коммит 2080518c80
1 изменённых файлов: 97 добавлений и 116 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

185
content/base/src/nsXMLHttpRequest.cpp
Просмотреть файл

@ -377,15 +377,13 @@ nsXMLHttpRequest::DetectCharset(nsACString& aCharset)
} }
nsresult nsresult
nsXMLHttpRequest::ConvertBodyToText(PRUnichar **aOutBuffer) nsXMLHttpRequest::ConvertBodyToText(nsAString& aOutBuffer)
{ {
// This code here is basically a copy of a similar thing in // This code here is basically a copy of a similar thing in
// nsScanner::Append(const char* aBuffer, PRUint32 aLen). // nsScanner::Append(const char* aBuffer, PRUint32 aLen).
// If we get illegal characters in the input we replace // If we get illegal characters in the input we replace
// them and don't just fail. // them and don't just fail.
*aOutBuffer = nsnull;
PRInt32 dataLen = mResponseBody.Length(); PRInt32 dataLen = mResponseBody.Length();
if (!dataLen) if (!dataLen)
return NS_OK; return NS_OK;
@ -404,13 +402,13 @@ nsXMLHttpRequest::ConvertBodyToText(PRUnichar **aOutBuffer)
} }
if (dataCharset.Equals(NS_LITERAL_CSTRING("ASCII"))) { if (dataCharset.Equals(NS_LITERAL_CSTRING("ASCII"))) {
*aOutBuffer = ToNewUnicode(nsDependentCString(mResponseBody.get(),dataLen)); CopyASCIItoUTF16(mResponseBody, aOutBuffer);
if (!*aOutBuffer)
return NS_ERROR_OUT_OF_MEMORY;
return NS_OK; return NS_OK;
} }
nsCOMPtr<nsICharsetConverterManager> ccm(do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID,&rv)); nsCOMPtr<nsICharsetConverterManager> ccm =
do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -464,31 +462,24 @@ nsXMLHttpRequest::ConvertBodyToText(PRUnichar **aOutBuffer)
} }
} while ( NS_FAILED(rv) && (dataLen > 0) ); } while ( NS_FAILED(rv) && (dataLen > 0) );
outBuffer[totalChars] = '\0'; aOutBuffer.Assign(outBuffer, totalChars);
*aOutBuffer = outBuffer;
return NS_OK; return NS_OK;
} }
/* readonly attribute wstring responseText; */ /* readonly attribute AString responseText; */
NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(PRUnichar **aResponseText) NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(nsAString& aResponseText)
{ {
NS_ENSURE_ARG_POINTER(aResponseText); nsresult rv = NS_OK;
*aResponseText = nsnull;
aResponseText.Truncate();
if (mState & (XML_HTTP_REQUEST_COMPLETED | if (mState & (XML_HTTP_REQUEST_COMPLETED |
XML_HTTP_REQUEST_INTERACTIVE)) { XML_HTTP_REQUEST_INTERACTIVE)) {
// First check if we can represent the data as a string - if it contains rv = ConvertBodyToText(aResponseText);
// nulls we won't try.
if (mResponseBody.FindChar('\0') >= 0)
return NS_OK;
nsresult rv = ConvertBodyToText(aResponseText);
if (NS_FAILED(rv))
return rv;
} }
return NS_OK; return rv;
} }
/* readonly attribute unsigned long status; */ /* readonly attribute unsigned long status; */
@ -505,24 +496,21 @@ nsXMLHttpRequest::GetStatus(PRUint32 *aStatus)
return NS_OK; return NS_OK;
} }
/* readonly attribute string statusText; */ /* readonly attribute AUTF8String statusText; */
NS_IMETHODIMP NS_IMETHODIMP
nsXMLHttpRequest::GetStatusText(char * *aStatusText) nsXMLHttpRequest::GetStatusText(nsACString& aStatusText)
{ {
NS_ENSURE_ARG_POINTER(aStatusText);
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel)); nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
*aStatusText = nsnull; aStatusText.Truncate();
nsresult rv = NS_OK;
if (httpChannel) { if (httpChannel) {
nsCAutoString text; rv = httpChannel->GetResponseStatusText(aStatusText);
nsresult rv = httpChannel->GetResponseStatusText(text);
if (NS_FAILED(rv)) return rv;
*aStatusText = ToNewCString(text);
return *aStatusText ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
} }
return NS_OK; return rv;
} }
/* void abort (); */ /* void abort (); */
@ -572,24 +560,21 @@ nsXMLHttpRequest::GetAllResponseHeaders(char **_retval)
return NS_OK; return NS_OK;
} }
/* string getResponseHeader (in string header); */ /* ACString getResponseHeader (in AUTF8String header); */
NS_IMETHODIMP NS_IMETHODIMP
nsXMLHttpRequest::GetResponseHeader(const char *header, char **_retval) nsXMLHttpRequest::GetResponseHeader(const nsACString& header,
nsACString& _retval)
{ {
NS_ENSURE_ARG(header);
NS_ENSURE_ARG_POINTER(_retval);
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel)); nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
nsresult rv = NS_OK;
_retval.Truncate();
*_retval = nsnull;
if (httpChannel) { if (httpChannel) {
nsCAutoString buf; rv = httpChannel->GetResponseHeader(header, _retval);
nsresult rv = httpChannel->GetResponseHeader(nsDependentCString(header), buf);
if (NS_FAILED(rv)) return rv;
*_retval = ToNewCString(buf);
return *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
} }
return NS_OK; return rv;
} }
nsresult nsresult
@ -610,25 +595,22 @@ nsXMLHttpRequest::GetLoadGroup(nsILoadGroup **aLoadGroup)
return NS_OK; return NS_OK;
} }
nsresult nsIURI *
nsXMLHttpRequest::GetBaseURI(nsIURI **aBaseURI) nsXMLHttpRequest::GetBaseURI()
{ {
NS_ENSURE_ARG_POINTER(aBaseURI);
*aBaseURI = nsnull;
if (!mScriptContext) { if (!mScriptContext) {
mScriptContext = GetCurrentContext(); mScriptContext = GetCurrentContext();
if (!mScriptContext) { if (!mScriptContext) {
return NS_OK; return nsnull;
} }
} }
nsCOMPtr<nsIDocument> doc = GetDocumentFromScriptContext(mScriptContext); nsCOMPtr<nsIDocument> doc = GetDocumentFromScriptContext(mScriptContext);
if (doc) { if (!doc) {
NS_IF_ADDREF(*aBaseURI = doc->GetBaseURI()); nsnull;
} }
return NS_OK; return doc->GetBaseURI();
} }
nsresult nsresult
@ -720,16 +702,16 @@ nsXMLHttpRequest::ClearEventListeners()
mOnReadystatechangeListener = nsnull; mOnReadystatechangeListener = nsnull;
} }
/* noscript void openRequest (in string method, in string url, in boolean async, in string user, in string password); */ /* noscript void openRequest (in AUTF8String method, in AUTF8String url, in boolean async, in AString user, in AString password); */
NS_IMETHODIMP NS_IMETHODIMP
nsXMLHttpRequest::OpenRequest(const char *method, nsXMLHttpRequest::OpenRequest(const nsACString& method,
const char *url, const nsACString& url,
PRBool async, PRBool async,
const char *user, const nsAString& user,
const char *password) const nsAString& password)
{ {
NS_ENSURE_ARG(method); NS_ENSURE_ARG(!method.IsEmpty());
NS_ENSURE_ARG(url); NS_ENSURE_ARG(!url.IsEmpty());
nsresult rv; nsresult rv;
nsCOMPtr<nsIURI> uri; nsCOMPtr<nsIURI> uri;
@ -760,15 +742,15 @@ nsXMLHttpRequest::OpenRequest(const char *method,
mState &= ~XML_HTTP_REQUEST_ASYNC; mState &= ~XML_HTTP_REQUEST_ASYNC;
} }
rv = NS_NewURI(getter_AddRefs(uri), url, mBaseURI); rv = NS_NewURI(getter_AddRefs(uri), url, nsnull, GetBaseURI());
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
if (user) { if (!user.IsEmpty()) {
nsCAutoString userpass; nsCAutoString userpass;
userpass.Assign(user); CopyUTF16toUTF8(user, userpass);
if (password) { if (!password.IsEmpty()) {
userpass.Append(":"); userpass.Append(':');
userpass.Append(password); AppendUTF16toUTF8(password, userpass);
} }
uri->SetUserPass(userpass); uri->SetUserPass(userpass);
authp = PR_TRUE; authp = PR_TRUE;
@ -790,7 +772,7 @@ nsXMLHttpRequest::OpenRequest(const char *method,
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel)); nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
if (httpChannel) { if (httpChannel) {
rv = httpChannel->SetRequestMethod(nsDependentCString(method)); rv = httpChannel->SetRequestMethod(method);
} }
ChangeState(XML_HTTP_REQUEST_OPENED); ChangeState(XML_HTTP_REQUEST_OPENED);
@ -798,16 +780,13 @@ nsXMLHttpRequest::OpenRequest(const char *method,
return rv; return rv;
} }
/* void open (in string method, in string url); */ /* void open (in AUTF8String method, in AUTF8String url); */
NS_IMETHODIMP NS_IMETHODIMP
nsXMLHttpRequest::Open(const char *method, const char *url) nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url)
{ {
NS_ENSURE_ARG(url);
nsresult rv; nsresult rv;
PRBool async = PR_TRUE; PRBool async = PR_TRUE;
char* user = nsnull; nsAutoString user, password;
char* password = nsnull;
nsCOMPtr<nsIXPCNativeCallContext> cc; nsCOMPtr<nsIXPCNativeCallContext> cc;
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
@ -828,10 +807,8 @@ nsXMLHttpRequest::Open(const char *method, const char *url)
rv = cc->GetJSContext(&cx); rv = cc->GetJSContext(&cx);
if (NS_FAILED(rv)) return NS_ERROR_FAILURE; if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
GetBaseURI(getter_AddRefs(mBaseURI));
nsCOMPtr<nsIURI> targetURI; nsCOMPtr<nsIURI> targetURI;
rv = NS_NewURI(getter_AddRefs(targetURI), url, mBaseURI); rv = NS_NewURI(getter_AddRefs(targetURI), url, nsnull, GetBaseURI());
if (NS_FAILED(rv)) return NS_ERROR_FAILURE; if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
nsCOMPtr<nsIScriptSecurityManager> secMan = nsCOMPtr<nsIScriptSecurityManager> secMan =
@ -859,23 +836,23 @@ nsXMLHttpRequest::Open(const char *method, const char *url)
if (argc > 2) { if (argc > 2) {
JSBool asyncBool; JSBool asyncBool;
JS_ValueToBoolean(cx, argv[2], &asyncBool); ::JS_ValueToBoolean(cx, argv[2], &asyncBool);
async = (PRBool)asyncBool; async = (PRBool)asyncBool;
if (argc > 3) { if (argc > 3) {
JSString* userStr; JSString* userStr = ::JS_ValueToString(cx, argv[3]);
userStr = JS_ValueToString(cx, argv[3]);
if (userStr) { if (userStr) {
user = JS_GetStringBytes(userStr); user.Assign((PRUnichar *)::JS_GetStringChars(userStr),
::JS_GetStringLength(userStr));
} }
if (argc > 4) { if (argc > 4) {
JSString* passwordStr; JSString* passwordStr = JS_ValueToString(cx, argv[4]);
passwordStr = JS_ValueToString(cx, argv[4]);
if (passwordStr) { if (passwordStr) {
password = JS_GetStringBytes(passwordStr); password.Assign((PRUnichar *)::JS_GetStringChars(passwordStr),
::JS_GetStringLength(passwordStr));
} }
} }
} }
@ -1197,7 +1174,8 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
// if there are no event listeners set and we are doing // if there are no event listeners set and we are doing
// an asynchronous call. // an asynchronous call.
// Ignore argument if method is GET, there is no point in trying to upload anything // Ignore argument if method is GET, there is no point in trying to
// upload anything
nsCAutoString method; nsCAutoString method;
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel)); nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
@ -1212,7 +1190,7 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
PRUint16 dataType; PRUint16 dataType;
rv = aBody->GetDataType(&dataType); rv = aBody->GetDataType(&dataType);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return NS_ERROR_FAILURE; return rv;
switch (dataType) { switch (dataType) {
case nsIDataType::VTYPE_INTERFACE: case nsIDataType::VTYPE_INTERFACE:
@ -1222,7 +1200,7 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
nsID *iid; nsID *iid;
rv = aBody->GetAsInterface(&iid, getter_AddRefs(supports)); rv = aBody->GetAsInterface(&iid, getter_AddRefs(supports));
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return NS_ERROR_FAILURE; return rv;
if (iid) if (iid)
nsMemory::Free(iid); nsMemory::Free(iid);
@ -1230,11 +1208,11 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
nsCOMPtr<nsIDOMDocument> doc(do_QueryInterface(supports)); nsCOMPtr<nsIDOMDocument> doc(do_QueryInterface(supports));
if (doc) { if (doc) {
nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rv)); nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rv));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE; if (NS_FAILED(rv)) return rv;
rv = serializer->SerializeToString(doc, getter_Copies(serial)); rv = serializer->SerializeToString(doc, serial);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return NS_ERROR_FAILURE; return rv;
} else { } else {
// nsISupportsString? // nsISupportsString?
nsCOMPtr<nsISupportsString> wstr(do_QueryInterface(supports)); nsCOMPtr<nsISupportsString> wstr(do_QueryInterface(supports));
@ -1288,14 +1266,14 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
} }
// Get and initialize a DOMImplementation // Get and initialize a DOMImplementation
nsCOMPtr<nsIDOMDOMImplementation> implementation(do_CreateInstance(kIDOMDOMImplementationCID, &rv)); nsCOMPtr<nsIDOMDOMImplementation> implementation =
if (NS_FAILED(rv)) return NS_ERROR_FAILURE; do_CreateInstance(kIDOMDOMImplementationCID, &rv);
if (NS_FAILED(rv)) return rv;
if (mBaseURI) { nsCOMPtr<nsIPrivateDOMImplementation> privImpl =
nsCOMPtr<nsIPrivateDOMImplementation> privImpl(do_QueryInterface(implementation)); do_QueryInterface(implementation);
if (privImpl) { if (privImpl) {
privImpl->Init(mBaseURI); privImpl->Init(GetBaseURI());
}
} }
// Create an empty document from it (resets current document as well) // Create an empty document from it (resets current document as well)
@ -1356,7 +1334,7 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
if (modalEventQueue) { if (modalEventQueue) {
mEventQService->PopThreadEventQueue(modalEventQueue); mEventQService->PopThreadEventQueue(modalEventQueue);
} }
return NS_ERROR_FAILURE; return rv;
} }
// If we're synchronous, spin an event loop here and wait // If we're synchronous, spin an event loop here and wait
@ -1375,20 +1353,23 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
return NS_OK; return NS_OK;
} }
/* void setRequestHeader (in string header, in string value); */ /* void setRequestHeader (in AUTF8String header, in AUTF8String value); */
NS_IMETHODIMP NS_IMETHODIMP
nsXMLHttpRequest::SetRequestHeader(const char *header, const char *value) nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
const nsACString& value)
{ {
if (!mChannel) // open() initializes mChannel, and open() if (!mChannel) // open() initializes mChannel, and open()
return NS_ERROR_FAILURE; // must be called before first setRequestHeader() return NS_ERROR_FAILURE; // must be called before first setRequestHeader()
if (!IsASCII(header) || !IsASCII(value)) {
return NS_ERROR_INVALID_ARG;
}
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel)); nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
if (httpChannel) { if (httpChannel) {
// We need to set, not add to, the header. // We need to set, not add to, the header.
return httpChannel->SetRequestHeader(nsDependentCString(header), return httpChannel->SetRequestHeader(header, value, PR_FALSE);
nsDependentCString(value),
PR_FALSE);
} }
return NS_OK; return NS_OK;
@ -1417,9 +1398,9 @@ nsXMLHttpRequest::GetReadyState(PRInt32 *aState)
return NS_OK; return NS_OK;
} }
/* void overrideMimeType(in string mimetype); */ /* void overrideMimeType(in AUTF8String mimetype); */
NS_IMETHODIMP NS_IMETHODIMP
nsXMLHttpRequest::OverrideMimeType(const char* aMimeType) nsXMLHttpRequest::OverrideMimeType(const nsACString& aMimeType)
{ {
// XXX Should we do some validation here? // XXX Should we do some validation here?
mOverrideMimeType.Assign(aMimeType); mOverrideMimeType.Assign(aMimeType);