Bug 1416038 (part 10) - nsSAXXMLReader.cpp doesn't need to be an nsIExtendedExpatSink. r=erahm

--HG--
extra : rebase_source : dd2e8b2b46aeeabaa9dfa14b3b2ab4e2eccdc275

parser/xml/nsSAXXMLReader.cpp

@@ -36,7 +36,6 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSAXXMLReader)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSAXXMLReader)
   NS_INTERFACE_MAP_ENTRY(nsISAXXMLReader)
   NS_INTERFACE_MAP_ENTRY(nsIExpatSink)
-  NS_INTERFACE_MAP_ENTRY(nsIExtendedExpatSink)
   NS_INTERFACE_MAP_ENTRY(nsIContentSink)
   NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
   NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
@@ -49,6 +48,7 @@ nsSAXXMLReader::nsSAXXMLReader()
 }
 
 // nsIContentSink
+
 NS_IMETHODIMP
 nsSAXXMLReader::WillBuildModel(nsDTDMode)
 {
@@ -73,7 +73,8 @@ nsSAXXMLReader::SetParser(nsParserBase *aParser)
   return NS_OK;
 }
 
-// nsIExtendedExpatSink
+// nsIExpatSink
+
 NS_IMETHODIMP
 nsSAXXMLReader::HandleStartElement(const char16_t *aName,
                                    const char16_t **aAtts,
@@ -133,14 +134,6 @@ nsSAXXMLReader::HandleCDataSection(const char16_t *aData,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsSAXXMLReader::HandleStartDTD(const char16_t *aName,
-                               const char16_t *aSystemId,
-                               const char16_t *aPublicId)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsSAXXMLReader::HandleDoctypeDecl(const nsAString & aSubset,
                                   const nsAString & aName,
@@ -161,19 +154,6 @@ nsSAXXMLReader::HandleCharacterData(const char16_t *aData,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsSAXXMLReader::HandleStartNamespaceDecl(const char16_t *aPrefix,
-                                         const char16_t *aUri)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSAXXMLReader::HandleEndNamespaceDecl(const char16_t *aPrefix)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsSAXXMLReader::HandleProcessingInstruction(const char16_t *aTarget,
                                             const char16_t *aData)
@@ -187,25 +167,6 @@ nsSAXXMLReader::HandleProcessingInstruction(const char16_t *aTarget,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsSAXXMLReader::HandleNotationDecl(const char16_t *aNotationName,
-                                   const char16_t *aSystemId,
-                                   const char16_t *aPublicId)
-{
-  NS_ASSERTION(aNotationName, "null passed to handler");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSAXXMLReader::HandleUnparsedEntityDecl(const char16_t *aEntityName,
-                                         const char16_t *aSystemId,
-                                         const char16_t *aPublicId,
-                                         const char16_t *aNotationName)
-{
-  NS_ASSERTION(aEntityName && aNotationName, "null passed to handler");
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsSAXXMLReader::HandleXMLDeclaration(const char16_t *aVersion,
                                      const char16_t *aEncoding,

parser/xml/nsSAXXMLReader.h

@@ -8,7 +8,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsIContentSink.h"
-#include "nsIExtendedExpatSink.h"
+#include "nsIExpatSink.h"
 #include "nsIParser.h"
 #include "nsIURI.h"
 #include "nsISAXXMLReader.h"
@@ -24,14 +24,13 @@
 { 0x96, 0xd0, 0x47, 0xa8, 0x28, 0x2a, 0xe3, 0xdb} }
 
 class nsSAXXMLReader final : public nsISAXXMLReader,
-                             public nsIExtendedExpatSink,
+                             public nsIExpatSink,
                              public nsIContentSink
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsSAXXMLReader, nsISAXXMLReader)
   NS_DECL_NSIEXPATSINK
-  NS_DECL_NSIEXTENDEDEXPATSINK
   NS_DECL_NSISAXXMLREADER
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER