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/xul/XULDocument.cpp | |
| 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/xul/XULDocument.cpp')
| -rw-r--r-- | dom/xul/XULDocument.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/dom/xul/XULDocument.cpp b/dom/xul/XULDocument.cpp index 929efc1af..d3b94920a 100644 --- a/dom/xul/XULDocument.cpp +++ b/dom/xul/XULDocument.cpp @@ -1578,24 +1578,13 @@ XULDocument::GetCommandDispatcher(nsIDOMXULCommandDispatcher** aTracker) } Element* -XULDocument::GetElementById(const nsAString& aId) +XULDocument::GetRefById(const nsAString& aID) { - if (!CheckGetElementByIdArg(aId)) - return nullptr; - - nsIdentifierMapEntry *entry = mIdentifierMap.GetEntry(aId); - if (entry) { - Element* element = entry->GetIdElement(); - if (element) - return element; - } - - nsRefMapEntry* refEntry = mRefMap.GetEntry(aId); - if (refEntry) { - NS_ASSERTION(refEntry->GetFirstElement(), - "nsRefMapEntries should have nonempty content lists"); + if (nsRefMapEntry* refEntry = mRefMap.GetEntry(aID)) { + MOZ_ASSERT(refEntry->GetFirstElement()); return refEntry->GetFirstElement(); } + return nullptr; } |