зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1303029 - nsLocation doesn't have username/password, r=smaug
This commit is contained in:
Родитель
e380831793
Коммит
97aceec5a3
|
@ -721,90 +721,6 @@ Location::SetProtocol(const nsAString& aProtocol)
|
|||
return SetURI(uri);
|
||||
}
|
||||
|
||||
void
|
||||
Location::GetUsername(nsAString& aUsername, ErrorResult& aError)
|
||||
{
|
||||
THROW_AND_RETURN_IF_CALLER_DOESNT_SUBSUME();
|
||||
|
||||
aUsername.Truncate();
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = GetURI(getter_AddRefs(uri));
|
||||
if (uri) {
|
||||
nsAutoCString username;
|
||||
result = uri->GetUsername(username);
|
||||
if (NS_SUCCEEDED(result)) {
|
||||
CopyUTF8toUTF16(username, aUsername);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
Location::SetUsername(const nsAString& aUsername, ErrorResult& aError)
|
||||
{
|
||||
THROW_AND_RETURN_IF_CALLER_DOESNT_SUBSUME();
|
||||
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult rv = GetWritableURI(getter_AddRefs(uri));
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
aError.Throw(rv);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!uri) {
|
||||
return;
|
||||
}
|
||||
|
||||
rv = uri->SetUsername(NS_ConvertUTF16toUTF8(aUsername));
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
aError.Throw(rv);
|
||||
return;
|
||||
}
|
||||
|
||||
rv = SetURI(uri);
|
||||
}
|
||||
|
||||
void
|
||||
Location::GetPassword(nsAString& aPassword, ErrorResult& aError)
|
||||
{
|
||||
THROW_AND_RETURN_IF_CALLER_DOESNT_SUBSUME();
|
||||
|
||||
aPassword.Truncate();
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = GetURI(getter_AddRefs(uri));
|
||||
if (uri) {
|
||||
nsAutoCString password;
|
||||
result = uri->GetPassword(password);
|
||||
if (NS_SUCCEEDED(result)) {
|
||||
CopyUTF8toUTF16(password, aPassword);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
Location::SetPassword(const nsAString& aPassword, ErrorResult& aError)
|
||||
{
|
||||
THROW_AND_RETURN_IF_CALLER_DOESNT_SUBSUME();
|
||||
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult rv = GetWritableURI(getter_AddRefs(uri));
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
aError.Throw(rv);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!uri) {
|
||||
return;
|
||||
}
|
||||
|
||||
rv = uri->SetPassword(NS_ConvertUTF16toUTF8(aPassword));
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
aError.Throw(rv);
|
||||
return;
|
||||
}
|
||||
|
||||
rv = SetURI(uri);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
Location::GetSearch(nsAString& aSearch)
|
||||
{
|
||||
|
|
|
@ -91,10 +91,6 @@ public:
|
|||
THROW_AND_RETURN_IF_CALLER_DOESNT_SUBSUME();
|
||||
aError = SetProtocol(aProtocol);
|
||||
}
|
||||
void GetUsername(nsAString& aUsername, ErrorResult& aError);
|
||||
void SetUsername(const nsAString& aUsername, ErrorResult& aError);
|
||||
void GetPassword(nsAString& aPassword, ErrorResult& aError);
|
||||
void SetPassword(const nsAString& aPassword, ErrorResult& aError);
|
||||
void GetHost(nsAString& aHost, ErrorResult& aError)
|
||||
{
|
||||
THROW_AND_RETURN_IF_CALLER_DOESNT_SUBSUME();
|
||||
|
|
Загрузка…
Ссылка в новой задаче