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)

dom/html/HTMLSelectElement.cpp

@@ -350,7 +350,7 @@ HTMLSelectElement::InsertOptionsIntoListRecurse(nsIContent* aOptions,
   }
 
   // Recurse down into optgroups
-  if (aOptions->IsHTML(nsGkAtoms::optgroup)) {
+  if (aOptions->IsHTMLElement(nsGkAtoms::optgroup)) {
     mOptGroupCount++;
 
     for (nsIContent* child = aOptions->GetFirstChild();
@@ -391,7 +391,7 @@ HTMLSelectElement::RemoveOptionsFromListRecurse(nsIContent* aOptions,
   }
 
   // Recurse down deeper for options
-  if (mOptGroupCount && aOptions->IsHTML(nsGkAtoms::optgroup)) {
+  if (mOptGroupCount && aOptions->IsHTMLElement(nsGkAtoms::optgroup)) {
     mOptGroupCount--;
 
     for (nsIContent* child = aOptions->GetFirstChild();
@@ -1136,7 +1136,7 @@ HTMLSelectElement::IsOptionDisabled(HTMLOptionElement* aOption)
          node;
          node = node->GetParentElement()) {
       // If we reached the select element, we're done
-      if (node->IsHTML(nsGkAtoms::select)) {
+      if (node->IsHTMLElement(nsGkAtoms::select)) {
         return false;
       }
 
@@ -1801,7 +1801,7 @@ AddOptionsRecurse(nsIContent* aRoot, HTMLOptionsCollection* aArray)
     HTMLOptionElement* opt = HTMLOptionElement::FromContent(cur);
     if (opt) {
       aArray->AppendOption(opt);
-    } else if (cur->IsHTML(nsGkAtoms::optgroup)) {
+    } else if (cur->IsHTMLElement(nsGkAtoms::optgroup)) {
       AddOptionsRecurse(cur, aArray);
     }
   }
@@ -1882,7 +1882,7 @@ VerifyOptionsRecurse(nsIContent* aRoot, int32_t& aIndex,
     if (opt) {
       NS_ASSERTION(opt == aArray->ItemAsOption(aIndex++),
                    "Options collection broken");
-    } else if (cur->IsHTML(nsGkAtoms::optgroup)) {
+    } else if (cur->IsHTMLElement(nsGkAtoms::optgroup)) {
       VerifyOptionsRecurse(cur, aIndex, aArray);
     }
   }