Bug 1605737, remove XUL cached type r=bzbarsky
authorEmma Malysz <emalysz@mozilla.com>
Mon, 23 Dec 2019 17:10:15 +0000
changeset 508277 f19e270a7343c2e8bd5360e9f598900ad6152cea
parent 508276 6493da33ecacf937e915726cb71f9f1ec3f68da1
child 508278 5e87b9f668a9a07c0b8ecfb3adc525012e9132c6
push id36944
push userapavel@mozilla.com
push dateMon, 23 Dec 2019 21:41:35 +0000
treeherdermozilla-central@99d782b09b7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs1605737
milestone73.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1605737, remove XUL cached type r=bzbarsky Differential Revision: https://phabricator.services.mozilla.com/D58140
dom/html/nsHTMLDocument.cpp
layout/build/components.conf
layout/build/nsContentDLF.cpp
layout/build/nsContentDLF.h
netwerk/mime/nsMimeTypes.h
toolkit/modules/BrowserUtils.jsm
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -422,17 +422,16 @@ nsresult nsHTMLDocument::StartDocumentLo
   if (!(view || viewSource || asData)) {
     MOZ_ASSERT(false, "Bad parser command");
     return NS_ERROR_INVALID_ARG;
   }
 
   bool html = contentType.EqualsLiteral(TEXT_HTML);
   bool xhtml = !html && (contentType.EqualsLiteral(APPLICATION_XHTML_XML) ||
                          contentType.EqualsLiteral(APPLICATION_WAPXHTML_XML) ||
-                         contentType.EqualsLiteral(APPLICATION_CACHED_XUL) ||
                          contentType.EqualsLiteral(TEXT_XUL));
   mIsPlainText =
       !html && !xhtml && nsContentUtils::IsPlainTextType(contentType);
   if (!(html || xhtml || mIsPlainText || viewSource)) {
     MOZ_ASSERT(false, "Channel with bad content type.");
     return NS_ERROR_INVALID_ARG;
   }
 
--- a/layout/build/components.conf
+++ b/layout/build/components.conf
@@ -21,17 +21,16 @@ content_types = [
     'application/rdf+xml',
     'application/vnd.mozilla.xul+xml',
     'application/vnd.wap.xhtml+xml',
     'application/x-javascript',
     'application/x-view-source',
     'application/xhtml+xml',
     'application/xml',
     'image/svg+xml',
-    'mozilla.application/cached-xul',
     'text/cache-manifest',
     'text/css',
     'text/ecmascript',
     'text/html',
     'text/javascript',
     'text/json',
     'text/plain',
     'text/rdf',
--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -37,17 +37,16 @@ using mozilla::dom::Document;
 
 already_AddRefed<nsIContentViewer> NS_NewContentViewer();
 
 static const char* const gHTMLTypes[] = {TEXT_HTML,
                                          VIEWSOURCE_CONTENT_TYPE,
                                          APPLICATION_XHTML_XML,
                                          APPLICATION_WAPXHTML_XML,
                                          TEXT_XUL,
-                                         APPLICATION_CACHED_XUL,
                                          0};
 
 static const char* const gXMLTypes[] = {TEXT_XML,
                                         APPLICATION_XML,
                                         APPLICATION_MATHML_XML,
                                         APPLICATION_RDF_XML,
                                         TEXT_RDF,
                                         0};
--- a/layout/build/nsContentDLF.h
+++ b/layout/build/nsContentDLF.h
@@ -77,17 +77,16 @@ nsresult NS_NewContentDocumentLoaderFact
     { "Gecko-Content-Viewers", APPLICATION_JSON, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", TEXT_JSON, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_XHTML_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", TEXT_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_RDF_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", TEXT_RDF, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", TEXT_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
-    { "Gecko-Content-Viewers", APPLICATION_CACHED_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", VIEWSOURCE_CONTENT_TYPE, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", IMAGE_SVG_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_MATHML_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", TEXT_VTT, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_WAPXHTML_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     CONTENTDLF_WEBM_CATEGORIES
 // clang-format on
 
--- a/netwerk/mime/nsMimeTypes.h
+++ b/netwerk/mime/nsMimeTypes.h
@@ -226,11 +226,10 @@
 #define PARAM_FORMAT "format"
 
 #define UNKNOWN_CONTENT_TYPE "application/x-unknown-content-type"
 #define APPLICATION_GUESS_FROM_EXT "application/x-vnd.mozilla.guess-from-ext"
 #define VIEWSOURCE_CONTENT_TYPE "application/x-view-source"
 
 #define APPLICATION_DIRECTORY \
   "application/directory" /* text/x-vcard is synonym */
-#define APPLICATION_CACHED_XUL "mozilla.application/cached-xul"
 
 #endif /* nsMimeTypes_h_ */
--- a/toolkit/modules/BrowserUtils.jsm
+++ b/toolkit/modules/BrowserUtils.jsm
@@ -289,18 +289,17 @@ var BrowserUtils = {
    */
   mimeTypeIsTextBased(mimeType) {
     return (
       mimeType.startsWith("text/") ||
       mimeType.endsWith("+xml") ||
       mimeType == "application/x-javascript" ||
       mimeType == "application/javascript" ||
       mimeType == "application/json" ||
-      mimeType == "application/xml" ||
-      mimeType == "mozilla.application/cached-xul"
+      mimeType == "application/xml"
     );
   },
 
   /**
    * Return true if we should FAYT for this node + window (could be CPOW):
    *
    * @param elt
    *        The element that is focused