Commit 6c6f7200 authored by Peter Van der Beken's avatar Peter Van der Beken
Browse files

Bug 1749935 - Remove nsITokenizer. r=hsivonen 

Differential Revision: https://phabricator.services.mozilla.com/D135887
parent d023f9c3

parser/html/nsHtml5Parser.h

+0 −1
Original line number Diff line number Diff line
@@ -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"

parser/htmlparser/CParserContext.cpp

+0 −20
Original line number Diff line number Diff line
@@ -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;

}

parser/htmlparser/CParserContext.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

parser/htmlparser/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -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",

parser/htmlparser/nsExpatDriver.cpp

+2 −4
Original line number Diff line number Diff line
@@ -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;