зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1418076 part 1. Get rid of nsIDOMHTMLDocument's domain attribute. r=mystor
MozReview-Commit-ID: Igf83iosX8L
This commit is contained in:
Родитель
9a65a40178
Коммит
3c11d297e3
|
@ -900,14 +900,14 @@ nsHTMLDocument::GetDomainURI()
|
|||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
void
|
||||
nsHTMLDocument::GetDomain(nsAString& aDomain)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri = GetDomainURI();
|
||||
|
||||
if (!uri) {
|
||||
SetDOMStringToNull(aDomain);
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
nsAutoCString hostName;
|
||||
|
@ -919,7 +919,6 @@ nsHTMLDocument::GetDomain(nsAString& aDomain)
|
|||
// etc), just return an null string.
|
||||
SetDOMStringToNull(aDomain);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
already_AddRefed<nsIURI>
|
||||
|
@ -1033,14 +1032,6 @@ nsHTMLDocument::IsRegistrableDomainSuffixOfOrEqualTo(const nsAString& aHostSuffi
|
|||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHTMLDocument::SetDomain(const nsAString& aDomain)
|
||||
{
|
||||
ErrorResult rv;
|
||||
SetDomain(aDomain, rv);
|
||||
return rv.StealNSResult();
|
||||
}
|
||||
|
||||
void
|
||||
nsHTMLDocument::SetDomain(const nsAString& aDomain, ErrorResult& rv)
|
||||
{
|
||||
|
|
|
@ -163,6 +163,7 @@ public:
|
|||
// WebIDL API
|
||||
virtual JSObject* WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
override;
|
||||
void GetDomain(nsAString& aDomain);
|
||||
void SetDomain(const nsAString& aDomain, mozilla::ErrorResult& rv);
|
||||
bool IsRegistrableDomainSuffixOfOrEqualTo(const nsAString& aHostSuffixString,
|
||||
const nsACString& aOrigHost);
|
||||
|
|
|
@ -16,7 +16,6 @@ interface nsISelection;
|
|||
[uuid(cd31e61f-cfc2-4b91-9385-17b6a2d0633d)]
|
||||
interface nsIDOMHTMLDocument : nsIDOMDocument
|
||||
{
|
||||
attribute DOMString domain;
|
||||
attribute DOMString cookie;
|
||||
|
||||
readonly attribute nsISupports head;
|
||||
|
|
Загрузка…
Ссылка в новой задаче