import changes from rmottola/Arctic-Fox:

- Bug 940273 - Part 1 - Fetch changes from maple twig to support Service Worker Cache. (5f8e82dd7)
- Bug 940273 - Part 1b - Expose nsFileProtocolHandler.h in mozilla/net. (71a3ebcf4)
- Bug 940273 - Part 2 - Add a pref to enable Service Worker Cache. (2e7b478d3)
- patch header include (3b90a9b8d)
- override -> MOZ_OVERRIDE (8f51321bc)
- override -> MOZ_OVERRIDE (5f4ab5143)
- Bug 1136563 - ARIA 1.1: Support role 'switch' (2484c9c27)
- Bug 1121518 - ARIA 1.1: Add support for role 'searchbox' (8d3ee1204)
- override -> MOZ_OVERRIDE (3db7a0cb4)
- Bug 1137714 - Make roleDescription nicer/correct/faster (da6beb861)
- Bug 1134280 - Get rid of Tag() - patch 1 - Is{HTML,XUL,MathML,SVG}Element and IsAnyOf{HTML,XUL,MathML,SVG}Elements (133801ca1)
- Bug 1134280 - Get rid of Tag() - patch 2.1 - /accessible - Fix all the occurrences (fbef71d88)
- Bug 1134280 - Get rid of Tag() - patch 2.2 - /editor - Fix all the occurrences (e54a21dcc)
- Bug 1134280 - Get rid of Tag() - patch 2.3 - dom/base and docshell - Fix all the occurrences (8bf192106)
- Bug 1134280 - Get rid of Tag() - patch 2.4 - layout/mathml - Fix all the occurrences (7914f351d)
- Bug 1134280 - Get rid of Tag() - patch 2.5 - dom/xul - Fix all the occurrences (6611b95ef)
- Bug 1134280 - Get rid of Tag() - patch 2.6 - layout/base and layout/form - Fix all the occurrences (61e06ff31)
- Bug 1134280 - Get rid of Tag() - patch 2.7 - layout/generic - Fix all the occurrences (bbe5865c2)
- Bug 1134280 - Get rid of Tag() - patch 2.8 - dom/html - Fix all the occurrences (7af471da5)
- Bug 1134280 - Get rid of Tag() - patch 2.9 - dom/svg, dom/xml, dom/xslt and dom/xbl - Fix all the occurrences (ab9769748)
- Bug 1134280 - Get rid of Tag() - patch 2.10 - dom/events, dom/mathml, dom/plugins, dom/smil - Fix all the occurrences (421ba62f4)
- Bug 1134280 - Get rid of Tag() - patch 2.11 - layout/xul - Fix all the occurrences (e19e64b2c)
- Bug 1134280 - Get rid of Tag() - patch 2.12 - layout/style, layout/svg - Fix all the occurrences (7ec90f520)
- Bug 1134280 - Get rid of Tag() - patch 2.13 - Fix all the occurrences (a887a4341)
- Bug 1134280 - Get rid of Tag() - patch 3 - nsContentUtils::IsHTMLBlock should work with nsIContent inste nsIAtom (28fa04521)
- Bug 1134280 - Get rid of Tag() - patch 4 - Get rid of nsDocumentEncoder::IsTag (ed4bf4d48)
- Bug 1134280 - Get rid of Tag() - patch 5 - nsGenericHTMLElement::IsHTMLElement (70a2822c7)
- Bug 1134280 - Get rid of Tag() - patch 6 - Remove nsINode::Tag() (85885131f)
- Bug 1134280 - Get rid of Tag() - patch 7 - Followup to fix bustage. (actuall, backport, it was missing) (cfcfa3e74)
- Bug 1134280 - Get rid of Tag() - patch 8 - Fixed a debug-only compilation issue (502319995)
- Bug 1356843 - Fix -Wcomma warnings in dom/base/ and dom/xml/. clang's -Wcomma warning warns about suspicious use of the comma operator such as between two statements or to call a function for side effects within an expression. (0f1ad0554)
This commit is contained in:
2019-02-23 00:13:11 +08:00
parent c5cfe29d26
commit 9ca494cce7
286 changed files with 2461 additions and 2095 deletions
+16 -19
View File
@@ -626,7 +626,7 @@ nsIdentifierMapEntry::RemoveIdElement(Element* aElement)
// This could fire in OOM situations
// Only assert this in HTML documents for now as XUL does all sorts of weird
// crap.
NS_ASSERTION(!aElement->OwnerDoc()->IsHTML() ||
NS_ASSERTION(!aElement->OwnerDoc()->IsHTMLDocument() ||
mIdContentList.IndexOf(aElement) >= 0,
"Removing id entry that doesn't exist");
@@ -5473,7 +5473,7 @@ nsIDocument::CreateElement(const nsAString& aTagName, ErrorResult& rv)
return nullptr;
}
bool needsLowercase = IsHTML() && !IsLowercaseASCII(aTagName);
bool needsLowercase = IsHTMLDocument() && !IsLowercaseASCII(aTagName);
nsAutoString lcTagName;
if (needsLowercase) {
nsContentUtils::ASCIIToLower(aTagName, lcTagName);
@@ -5497,7 +5497,7 @@ nsDocument::SetupCustomElement(Element* aElement,
return;
}
nsCOMPtr<nsIAtom> tagAtom = aElement->Tag();
nsCOMPtr<nsIAtom> tagAtom = aElement->NodeInfo()->NameAtom();
nsCOMPtr<nsIAtom> typeAtom = aTypeExtension ?
do_GetAtom(*aTypeExtension) : tagAtom;
@@ -5676,7 +5676,7 @@ already_AddRefed<CDATASection>
nsIDocument::CreateCDATASection(const nsAString& aData,
ErrorResult& rv)
{
if (IsHTML()) {
if (IsHTMLDocument()) {
rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return nullptr;
}
@@ -6134,7 +6134,7 @@ nsDocument::RegisterElement(JSContext* aCx, const nsAString& aType,
// Only convert NAME to lowercase in HTML documents. Note that NAME is
// options.extends.
nsAutoString lcName;
if (IsHTML()) {
if (IsHTMLDocument()) {
nsContentUtils::ASCIIToLower(aOptions.mExtends, lcName);
} else {
lcName.Assign(aOptions.mExtends);
@@ -6328,15 +6328,12 @@ nsDocument::RegisterElement(JSContext* aCx, const nsAString& aType,
// Make sure that the element name matches the name in the definition.
// (e.g. a definition for x-button extending button should match
// <button is="x-button"> but not <x-button>.
// Note: we also check the tag name, because if it's not the above
// mentioned case, it can be that only the |is| property has been
// changed, which we should ignore by the spec.
if (elem->NodeInfo()->NameAtom() != nameAtom &&
elem->Tag() == nameAtom) {
if (elem->NodeInfo()->NameAtom() != nameAtom) {
//Skip over this element because definition does not apply.
continue;
}
MOZ_ASSERT(elem->IsHTMLElement(nameAtom));
nsWrapperCache* cache;
CallQueryInterface(elem, &cache);
MOZ_ASSERT(cache, "Element doesn't support wrapper cache?");
@@ -7003,7 +7000,7 @@ Element*
nsIDocument::GetHtmlElement() const
{
Element* rootElement = GetRootElement();
if (rootElement && rootElement->IsHTML(nsGkAtoms::html))
if (rootElement && rootElement->IsHTMLElement(nsGkAtoms::html))
return rootElement;
return nullptr;
}
@@ -7020,7 +7017,7 @@ nsIDocument::GetHtmlChildElement(nsIAtom* aTag)
for (nsIContent* child = html->GetFirstChild();
child;
child = child->GetNextSibling()) {
if (child->IsHTML(aTag))
if (child->IsHTMLElement(aTag))
return child->AsElement();
}
return nullptr;
@@ -7080,7 +7077,7 @@ nsDocument::GetTitle(nsString& aTitle)
break;
#endif
case kNameSpaceID_SVG:
if (rootElement->Tag() == nsGkAtoms::svg) {
if (rootElement->IsSVGElement(nsGkAtoms::svg)) {
GetTitleFromElement(kNameSpaceID_SVG, tmp);
break;
} // else fall through
@@ -7207,7 +7204,7 @@ nsDocument::GetBoxObjectFor(Element* aElement, ErrorResult& aRv)
return nullptr;
}
if (!mHasWarnedAboutBoxObjects && !aElement->IsXUL()) {
if (!mHasWarnedAboutBoxObjects && !aElement->IsXULElement()) {
mHasWarnedAboutBoxObjects = true;
nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
NS_LITERAL_CSTRING("BoxObjects"), this,
@@ -8158,7 +8155,7 @@ nsDocument::FlushPendingNotifications(mozFlushType aType)
// make sure that layout is started as needed. But we can skip that
// part if we have no presshell or if it's already done an initial
// reflow.
if ((!IsHTML() ||
if ((!IsHTMLDocument() ||
(aType > Flush_ContentAndNotify && mPresShell &&
!mPresShell->DidInitialize())) &&
(mParser || mWeakSink)) {
@@ -8331,7 +8328,7 @@ nsRadioGroupStruct*
nsDocument::GetRadioGroupInternal(const nsAString& aName) const
{
#ifdef DEBUG
if (IsHTML()) {
if (IsHTMLDocument()) {
nsAutoString lcName;
ToLowerCase(aName, lcName);
MOZ_ASSERT(aName == lcName);
@@ -8350,7 +8347,7 @@ nsRadioGroupStruct*
nsDocument::GetRadioGroup(const nsAString& aName) const
{
nsAutoString tmKey(aName);
if (IsHTML()) {
if (IsHTMLDocument()) {
ToLowerCase(tmKey); //should case-insensitive.
}
@@ -8361,7 +8358,7 @@ nsRadioGroupStruct*
nsDocument::GetOrCreateRadioGroup(const nsAString& aName)
{
nsAutoString tmKey(aName);
if (IsHTML()) {
if (IsHTMLDocument()) {
ToLowerCase(tmKey); //should case-insensitive.
}
@@ -8431,7 +8428,7 @@ nsDocument::GetNextRadioButton(const nsAString& aName,
else if (++index >= numRadios) {
index = 0;
}
NS_ASSERTION(static_cast<nsGenericHTMLFormElement*>(radioGroup->mRadioButtons[index])->IsHTML(nsGkAtoms::input),
NS_ASSERTION(static_cast<nsGenericHTMLFormElement*>(radioGroup->mRadioButtons[index])->IsHTMLElement(nsGkAtoms::input),
"mRadioButtons holding a non-radio button");
radio = static_cast<HTMLInputElement*>(radioGroup->mRadioButtons[index]);
} while (radio->Disabled() && radio != currentRadio);