Bug 1452235 part 4. Remove nsIDOMSerializer. r=qdot

MozReview-Commit-ID: 5foaztSLyEC

dom/base/moz.build

@@ -18,7 +18,6 @@ XPIDL_SOURCES += [
     'nsIDocumentEncoder.idl',
     'nsIDOMDOMRequest.idl',
     'nsIDOMParser.idl',
-    'nsIDOMSerializer.idl',
     'nsIDroppedLinkHandler.idl',
     'nsIFrameLoaderOwner.idl',
     'nsIImageLoadingContent.idl',

dom/base/nsDOMSerializer.cpp

@@ -30,7 +30,6 @@ nsDOMSerializer::~nsDOMSerializer()
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMSerializer)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMSerializer)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMSerializer, mOwner)

dom/base/nsDOMSerializer.h

@@ -7,14 +7,15 @@
 #ifndef nsDOMSerializer_h_
 #define nsDOMSerializer_h_
 
-#include "nsIDOMSerializer.h"
+#include "nsISupports.h"
 #include "nsWrapperCache.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/XMLSerializerBinding.h"
 
 class nsINode;
+class nsIOutputStream;
 
-class nsDOMSerializer final : public nsIDOMSerializer,
+class nsDOMSerializer final : public nsISupports,
                               public nsWrapperCache
 {
 public:
@@ -23,9 +24,6 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMSerializer)
 
-  // nsIDOMSerializer
-  NS_DECL_NSIDOMSERIALIZER
-
   // WebIDL API
   static already_AddRefed<nsDOMSerializer>
   Constructor(const mozilla::dom::GlobalObject& aOwner,

dom/base/nsIDOMSerializer.idl

@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIOutputStream;
-interface nsIDOMNode;
-
-/**
- * The nsIDOMSerializer interface is really a placeholder till the W3C
- * DOM Working Group defines a mechanism for serializing DOM nodes.
- * An instance of this interface can be used to serialize a DOM document
- * or any DOM subtree.
- */
-
-[uuid(9fd4ba15-e67c-4c98-b52c-7715f62c9196)]
-interface nsIDOMSerializer : nsISupports
-{
-};
-
-%{ C++
-#define NS_XMLSERIALIZER_CID                        \
- { /* a6cf9124-15b3-11d2-932e-00805f8add32 */       \
-   0xa6cf9124, 0x15b3, 0x11d2,                      \
-  {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-#define NS_XMLSERIALIZER_CONTRACTID \
-"@mozilla.org/xmlextras/xmlserializer;1"
-%}
-

dom/xhr/XMLHttpRequestMainThread.cpp

@@ -55,7 +55,6 @@
 #include "nsThreadUtils.h"
 #include "nsIUploadChannel.h"
 #include "nsIUploadChannel2.h"
-#include "nsIDOMSerializer.h"
 #include "nsXPCOM.h"
 #include "nsIDOMEventListener.h"
 #include "nsIScriptSecurityManager.h"

layout/build/nsLayoutModule.cpp

@@ -57,7 +57,6 @@
 #include "mozilla/dom/XPathEvaluator.h"
 
 #include "mozilla/dom/DOMParser.h"
-#include "nsDOMSerializer.h"
 
 // view stuff
 #include "nsContentCreatorFunctions.h"
@@ -199,7 +198,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(HTMLEditor)
 already_AddRefed<nsIPresentationService> NS_CreatePresentationService();
 
 // Factory Constructor
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMSerializer)
 typedef nsHostObjectURI::Mutator nsHostObjectURIMutator;
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHostObjectURIMutator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(DOMParser)
@@ -550,7 +548,6 @@ NS_DEFINE_NAMED_CID(NS_PLUGINDOCLOADERFACTORY_CID);
 NS_DEFINE_NAMED_CID(NS_PLUGINDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_VIDEODOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_STYLESHEETSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_XMLSERIALIZER_CID);
 NS_DEFINE_NAMED_CID(NS_HOSTOBJECTURI_CID);
 NS_DEFINE_NAMED_CID(NS_HOSTOBJECTURIMUTATOR_CID);
 NS_DEFINE_NAMED_CID(NS_DOMPARSER_CID);
@@ -793,7 +790,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_PLUGINDOCUMENT_CID, false, nullptr, CreatePluginDocument },
   { &kNS_VIDEODOCUMENT_CID, false, nullptr, CreateVideoDocument },
   { &kNS_STYLESHEETSERVICE_CID, false, nullptr, nsStyleSheetServiceConstructor },
-  { &kNS_XMLSERIALIZER_CID, false, nullptr, nsDOMSerializerConstructor },
   { &kNS_HOSTOBJECTURI_CID, false, nullptr, nsHostObjectURIMutatorConstructor }, // do_CreateInstance returns mutator
   { &kNS_HOSTOBJECTURIMUTATOR_CID, false, nullptr, nsHostObjectURIMutatorConstructor },
   { &kNS_DOMPARSER_CID, false, nullptr, DOMParserConstructor },
@@ -901,7 +897,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { NS_WINDOWCONTROLLER_CONTRACTID, &kNS_WINDOWCONTROLLER_CID },
   { PLUGIN_DLF_CONTRACTID, &kNS_PLUGINDOCLOADERFACTORY_CID },
   { NS_STYLESHEETSERVICE_CONTRACTID, &kNS_STYLESHEETSERVICE_CID },
-  { NS_XMLSERIALIZER_CONTRACTID, &kNS_XMLSERIALIZER_CID },
   { NS_DOMPARSER_CONTRACTID, &kNS_DOMPARSER_CID },
   { "@mozilla.org/dom/localStorage-manager;1", &kNS_DOMLOCALSTORAGEMANAGER_CID },
   // Keeping the old ContractID for backward compatibility

xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp

@@ -20,7 +20,6 @@
 #include "nsIDOMOfflineResourceList.h"
 #include "nsIDOMParser.h"
 #include "nsIDOMRange.h"
-#include "nsIDOMSerializer.h"
 #include "nsIDOMXMLDocument.h"
 #include "nsIListBoxObject.h"
 #include "nsIMessageManager.h"
@@ -65,7 +64,6 @@
 #include "mozilla/dom/TimeEventBinding.h"
 #include "mozilla/dom/TreeBoxObjectBinding.h"
 #include "mozilla/dom/XMLDocumentBinding.h"
-#include "mozilla/dom/XMLSerializerBinding.h"
 #include "mozilla/dom/XULDocumentBinding.h"
 
 using namespace mozilla;
@@ -139,7 +137,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
   DEFINE_SHIM(OfflineResourceList),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMParser, DOMParser),
   DEFINE_SHIM(Range),
-  DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMSerializer, XMLSerializer),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsITreeBoxObject, TreeBoxObject),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIWebBrowserPersistable, FrameLoader),
   DEFINE_SHIM(XMLDocument),