diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-14 10:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 10:01:06 +0000 |
| commit | 7cc007d9bf8927fc4ce1d5ea80a843d6edfc17dd (patch) | |
| tree | 7b3ba52faca3704faf53d8248cbe130a32481b21 /dom/html | |
| parent | 59a5adc93415f6d6e8ce4352ba0cd2d34d5e7888 (diff) | |
| parent | bbd59105da97200947ae62b2dc949a1130a40d75 (diff) | |
| download | UXP-7cc007d9bf8927fc4ce1d5ea80a843d6edfc17dd.tar UXP-7cc007d9bf8927fc4ce1d5ea80a843d6edfc17dd.tar.gz UXP-7cc007d9bf8927fc4ce1d5ea80a843d6edfc17dd.tar.lz UXP-7cc007d9bf8927fc4ce1d5ea80a843d6edfc17dd.tar.xz UXP-7cc007d9bf8927fc4ce1d5ea80a843d6edfc17dd.zip | |
Merge pull request #1591 from MoonchildProductions/sr.activeElement-work
Implement ShadowRoot.activeElement
Diffstat (limited to 'dom/html')
| -rw-r--r-- | dom/html/nsHTMLDocument.cpp | 2 | ||||
| -rw-r--r-- | dom/html/nsHTMLDocument.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp index bd9de39f0..f3cb096b9 100644 --- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -2094,7 +2094,7 @@ nsHTMLDocument::GetSupportedNames(nsTArray<nsString>& aNames) nsIdentifierMapEntry* entry = iter.Get(); if (entry->HasNameElement() || entry->HasIdElementExposedAsHTMLDocumentProperty()) { - aNames.AppendElement(entry->GetKey()); + aNames.AppendElement(entry->GetKeyAsString()); } } } diff --git a/dom/html/nsHTMLDocument.h b/dom/html/nsHTMLDocument.h index c9e46b3fa..4f44befbb 100644 --- a/dom/html/nsHTMLDocument.h +++ b/dom/html/nsHTMLDocument.h @@ -155,10 +155,7 @@ public: virtual void RemovedFromDocShell() override; - virtual mozilla::dom::Element *GetElementById(const nsAString& aElementId) override - { - return nsDocument::GetElementById(aElementId); - } + using mozilla::dom::DocumentOrShadowRoot::GetElementById; virtual void DocAddSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const override; // DocAddSizeOfIncludingThis is inherited from nsIDocument. |