Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-06-20 06:47:51 +08:00
commit ab4f78f4b7
46 changed files with 1004 additions and 604 deletions

View file

@ -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());
}
}
}

View file

@ -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.