diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-07-20 11:13:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 11:13:54 +0200 |
| commit | 7fce9b4a0aa36117e5c3d193bade1620d6e4bc91 (patch) | |
| tree | f9cfbb9aad3b3d9f50c30e33b3164f9dcbd39000 | |
| parent | cba8e7b14e7703fbe032e41acfaf7f1ba9536aaf (diff) | |
| parent | 324cab5115df99a14217545a180a0e36ff007ce7 (diff) | |
| download | UXP-7fce9b4a0aa36117e5c3d193bade1620d6e4bc91.tar UXP-7fce9b4a0aa36117e5c3d193bade1620d6e4bc91.tar.gz UXP-7fce9b4a0aa36117e5c3d193bade1620d6e4bc91.tar.lz UXP-7fce9b4a0aa36117e5c3d193bade1620d6e4bc91.tar.xz UXP-7fce9b4a0aa36117e5c3d193bade1620d6e4bc91.zip | |
Merge pull request #652 from janekptacijarabaci/dom_document_domain_null_1
Make document.domain non-nullable
| -rw-r--r-- | dom/html/nsHTMLDocument.cpp | 6 | ||||
| -rw-r--r-- | dom/webidl/HTMLDocument.webidl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp index 69e710242..d64c27727 100644 --- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -886,7 +886,7 @@ nsHTMLDocument::GetDomain(nsAString& aDomain) nsCOMPtr<nsIURI> uri = GetDomainURI(); if (!uri) { - SetDOMStringToNull(aDomain); + aDomain.Truncate(); return NS_OK; } @@ -896,8 +896,8 @@ nsHTMLDocument::GetDomain(nsAString& aDomain) CopyUTF8toUTF16(hostName, aDomain); } else { // If we can't get the host from the URI (e.g. about:, javascript:, - // etc), just return an null string. - SetDOMStringToNull(aDomain); + // etc), just return an empty string. + aDomain.Truncate(); } return NS_OK; } diff --git a/dom/webidl/HTMLDocument.webidl b/dom/webidl/HTMLDocument.webidl index 42f6d98f7..ffb61ccdd 100644 --- a/dom/webidl/HTMLDocument.webidl +++ b/dom/webidl/HTMLDocument.webidl @@ -7,7 +7,7 @@ [OverrideBuiltins] interface HTMLDocument : Document { [SetterThrows] - attribute DOMString? domain; + attribute DOMString domain; [Throws] attribute DOMString cookie; // DOM tree accessors |