Bug 1749935 - Remove nsITokenizer. r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D135887
dothq · Feb 14, 2022 · 6c6f720 · 6c6f720
1 parent d023f9c
commit 6c6f720
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 208 deletions.
diff --git a/parser/html/nsHtml5Parser.h b/parser/html/nsHtml5Parser.h
@@ -10,7 +10,6 @@
 #include "nsIParser.h"
 #include "nsDeque.h"
 #include "nsParserCIID.h"
-#include "nsITokenizer.h"
 #include "nsIContentSink.h"
 #include "nsIRequest.h"
 #include "nsIChannel.h"

diff --git a/parser/htmlparser/CParserContext.cpp b/parser/htmlparser/CParserContext.cpp
@@ -8,9 +8,7 @@
 #include "CParserContext.h"
 #include "prenv.h"
 #include "nsIHTMLContentSink.h"
-#include "nsHTMLTokenizer.h"
 #include "nsMimeTypes.h"
-#include "nsHTMLTokenizer.h"
 
 CParserContext::CParserContext(nsIURI* aURI, eParserCommands aCommand)
     : mScanner(aURI),
@@ -60,21 +58,3 @@ void CParserContext::SetMimeType(const nsACString& aMimeType) {
            mMimeType.EqualsLiteral(TEXT_RDF))
     mDocType = eXML;
 }
-
-nsresult CParserContext::GetTokenizer(nsIDTD* aDTD, nsIContentSink* aSink,
-                                      nsITokenizer*& aTokenizer) {
-  nsresult result = NS_OK;
-  int32_t type = aDTD ? aDTD->GetType() : NS_IPARSER_FLAG_HTML;
-
-  if (!mTokenizer) {
-    if (type == NS_IPARSER_FLAG_HTML || mParserCommand == eViewSource) {
-      mTokenizer = new nsHTMLTokenizer;
-    } else if (type == NS_IPARSER_FLAG_XML) {
-      mTokenizer = do_QueryInterface(aDTD, &result);
-    }
-  }
-
-  aTokenizer = mTokenizer;
-
-  return result;
-}
diff --git a/parser/htmlparser/CParserContext.h b/parser/htmlparser/CParserContext.h
@@ -37,14 +37,11 @@ class CParserContext {
 
   ~CParserContext();
 
-  nsresult GetTokenizer(nsIDTD* aDTD, nsIContentSink* aSink,
-                        nsITokenizer*& aTokenizer);
   void SetMimeType(const nsACString& aMimeType);
 
   nsCOMPtr<nsIRequest>
       mRequest;  // provided by necko to differnciate different input streams
                  // why is mRequest strongly referenced? see bug 102376.
-  nsCOMPtr<nsITokenizer> mTokenizer;
   nsScanner mScanner;
 
   nsCString mMimeType;

diff --git a/parser/htmlparser/moz.build b/parser/htmlparser/moz.build
@@ -25,7 +25,6 @@ EXPORTS += [
     "nsIFragmentContentSink.h",
     "nsIHTMLContentSink.h",
     "nsIParser.h",
-    "nsITokenizer.h",
     "nsParserBase.h",
     "nsParserCIID.h",
     "nsParserConstants.h",
@@ -39,7 +38,6 @@ UNIFIED_SOURCES += [
     "nsElementTable.cpp",
     "nsExpatDriver.cpp",
     "nsHTMLTags.cpp",
-    "nsHTMLTokenizer.cpp",
     "nsParser.cpp",
     "nsParserModule.cpp",
     "nsParserMsgUtils.cpp",

diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp
@@ -351,9 +351,8 @@ static void GetLocalDTDURI(const nsCatalogData* aCatalogData, nsIURI* aDTD,
 /***************************** END CATALOG UTILS *****************************/
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsExpatDriver)
-  NS_INTERFACE_MAP_ENTRY(nsITokenizer)
   NS_INTERFACE_MAP_ENTRY(nsIDTD)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDTD)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsExpatDriver)
@@ -1226,8 +1225,7 @@ void nsExpatDriver::ParseBuffer(const char16_t* aBuffer, uint32_t aLength,
   }
 }
 
-NS_IMETHODIMP
-nsExpatDriver::ConsumeToken(nsScanner& aScanner, bool aIsFinalChunk) {
+nsresult nsExpatDriver::ResumeParse(nsScanner& aScanner, bool aIsFinalChunk) {
   // We keep the scanner pointing to the position where Expat will start
   // parsing.
   nsScannerIterator currentExpatPosition;

diff --git a/parser/htmlparser/nsExpatDriver.h b/parser/htmlparser/nsExpatDriver.h
@@ -11,7 +11,6 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIDTD.h"
-#include "nsITokenizer.h"
 #include "nsIInputStream.h"
 #include "nsIParser.h"
 #include "nsCycleCollectionParticipant.h"
@@ -28,19 +27,20 @@ template <typename, size_t>
 class Array;
 }
 
-class nsExpatDriver : public nsIDTD, public nsITokenizer {
+class nsExpatDriver : public nsIDTD {
   virtual ~nsExpatDriver();
 
  public:
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS_FINAL
   NS_DECL_NSIDTD
-  NS_DECL_NSITOKENIZER
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsExpatDriver, nsIDTD)
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsExpatDriver)
 
   nsExpatDriver();
 
   nsresult Initialize(nsIURI* aURI, nsIContentSink* aSink);
 
+  nsresult ResumeParse(nsScanner& aScanner, bool aIsFinalChunk);
+
   int HandleExternalEntityRef(const char16_t* aOpenEntityNames,
                               const char16_t* aBase, const char16_t* aSystemId,
                               const char16_t* aPublicId);

diff --git a/parser/htmlparser/nsHTMLTokenizer.cpp b/parser/htmlparser/nsHTMLTokenizer.cpp
diff --git a/parser/htmlparser/nsHTMLTokenizer.h b/parser/htmlparser/nsHTMLTokenizer.h
diff --git a/parser/htmlparser/nsITokenizer.h b/parser/htmlparser/nsITokenizer.h
diff --git a/parser/htmlparser/nsParser.cpp b/parser/htmlparser/nsParser.cpp
@@ -22,7 +22,6 @@
 #include "nsExpatDriver.h"
 #include "nsIFragmentContentSink.h"
 #include "nsStreamUtils.h"
-#include "nsHTMLTokenizer.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsMimeTypes.h"
 #include "nsCharsetSource.h"
@@ -333,10 +332,6 @@ nsresult nsParser::WillBuildModel() {
     mDTD = new CNavDTD();
   }
 
-  nsITokenizer* tokenizer;
-  nsresult rv = mParserContext->GetTokenizer(mDTD, mSink, tokenizer);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   return mSink->WillBuildModel(mParserContext->mDTDMode);
 }
 
@@ -725,59 +720,32 @@ nsresult nsParser::ResumeParse(bool allowIteration, bool aIsFinalChunk,
 
         // Only allow parsing to be interrupted in the subsequent call to
         // build model.
-        nsITokenizer* theTokenizer = nullptr;
-        nsresult getTokenizerResult;
-        if (mParserContext) {
-          result = getTokenizerResult =
-              mParserContext->GetTokenizer(mDTD, mSink, theTokenizer);
-        } else {
-          getTokenizerResult = NS_ERROR_HTMLPARSER_BADTOKENIZER;
-          result = NS_OK;
-        }
-
         nsresult theTokenizerResult;
         if (mFlags & NS_PARSER_FLAG_CAN_TOKENIZE) {
-          if (NS_SUCCEEDED(getTokenizerResult)) {
-            theTokenizerResult = getTokenizerResult;
-
-            bool killSink = false;
-
-            while (NS_SUCCEEDED(theTokenizerResult)) {
-              mParserContext->mScanner.Mark();
-              theTokenizerResult = theTokenizer->ConsumeToken(
-                  mParserContext->mScanner, aIsFinalChunk);
-              if (NS_FAILED(theTokenizerResult)) {
-                mParserContext->mScanner.RewindToMark();
-                if (NS_ERROR_HTMLPARSER_EOF == theTokenizerResult) {
-                  break;
-                }
-                if (NS_ERROR_HTMLPARSER_STOPPARSING == theTokenizerResult) {
-                  killSink = true;
-                  theTokenizerResult = Terminate();
-                  break;
-                }
+          mParserContext->mScanner.Mark();
+          if (mDTD->GetType() == NS_IPARSER_FLAG_XML &&
+              mParserContext->mParserCommand != eViewSource) {
+            nsExpatDriver* expat = static_cast<nsExpatDriver*>(mDTD.get());
+            theTokenizerResult =
+                expat->ResumeParse(mParserContext->mScanner, aIsFinalChunk);
+            if (NS_FAILED(theTokenizerResult)) {
+              mParserContext->mScanner.RewindToMark();
+              if (NS_ERROR_HTMLPARSER_STOPPARSING == theTokenizerResult) {
+                theTokenizerResult = Terminate();
+                mSink = nullptr;
               }
             }
-
-            if (killSink) {
-              mSink = nullptr;
-            }
           } else {
-            theTokenizerResult = mInternalState =
-                NS_ERROR_HTMLPARSER_BADTOKENIZER;
+            // Nothing to do for non-XML. Note that this should only be
+            // about:blank at this point, we're also checking for view-source
+            // above, but that shouldn't end up here anymore.
+            theTokenizerResult = NS_ERROR_HTMLPARSER_EOF;
           }
         } else {
           theTokenizerResult = NS_OK;
         }
 
-        if (NS_SUCCEEDED(result)) {
-          if (mDTD) {
-            result = mDTD->BuildModel(mSink);
-          }
-        } else {
-          mInternalState = result = NS_ERROR_HTMLPARSER_BADTOKENIZER;
-        }
-
+        result = mDTD->BuildModel(mSink);
         if (result == NS_ERROR_HTMLPARSER_INTERRUPTED && aIsFinalChunk) {
           PostContinueEvent();
         }

diff --git a/parser/htmlparser/nsParser.h b/parser/htmlparser/nsParser.h
@@ -45,7 +45,6 @@
 #include "nsDeque.h"
 #include "CParserContext.h"
 #include "nsParserCIID.h"
-#include "nsITokenizer.h"
 #include "nsHTMLTags.h"
 #include "nsIContentSink.h"
 #include "nsCOMArray.h"