From bb4612daadbee3a268bf13cd6fb9be9e2c144f16 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 14 Feb 2022 13:03:47 +0000
Subject: [PATCH] Bug 1749935 - Remove nsIDTD::GetMode. r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D135848
---
 parser/htmlparser/CNavDTD.cpp       | 3 ---
 parser/htmlparser/nsExpatDriver.cpp | 3 ---
 parser/htmlparser/nsIDTD.h          | 9 +--------
 parser/htmlparser/nsParser.cpp      | 2 +-
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/parser/htmlparser/CNavDTD.cpp b/parser/htmlparser/CNavDTD.cpp
index 3e68d6469b66..3953547b62e4 100644
--- a/parser/htmlparser/CNavDTD.cpp
+++ b/parser/htmlparser/CNavDTD.cpp
@@ -51,6 +51,3 @@ CNavDTD::Terminate() {}
 
 NS_IMETHODIMP_(int32_t)
 CNavDTD::GetType() { return NS_IPARSER_FLAG_HTML; }
-
-NS_IMETHODIMP_(nsDTDMode)
-CNavDTD::GetMode() const { return eDTDMode_quirks; }
diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp
index 8b19ddc683c8..e29b5f34087f 100644
--- a/parser/htmlparser/nsExpatDriver.cpp
+++ b/parser/htmlparser/nsExpatDriver.cpp
@@ -1642,9 +1642,6 @@ nsExpatDriver::Terminate() {
 NS_IMETHODIMP_(int32_t)
 nsExpatDriver::GetType() { return NS_IPARSER_FLAG_XML; }
 
-NS_IMETHODIMP_(nsDTDMode)
-nsExpatDriver::GetMode() const { return eDTDMode_full_standards; }
-
 /*************************** Unused methods **********************************/
 
 void nsExpatDriver::MaybeStopParser(nsresult aState) {
diff --git a/parser/htmlparser/nsIDTD.h b/parser/htmlparser/nsIDTD.h
index 117cbc47be13..d004b089c9b0 100644
--- a/parser/htmlparser/nsIDTD.h
+++ b/parser/htmlparser/nsIDTD.h
@@ -82,12 +82,6 @@ class nsIDTD : public nsISupports {
   NS_IMETHOD_(void) Terminate() = 0;
 
   NS_IMETHOD_(int32_t) GetType() = 0;
-
-  /**
-   * Call this method after calling WillBuildModel to determine what mode the
-   * DTD actually is using, as it may differ from aParserContext.mDTDMode.
-   */
-  NS_IMETHOD_(nsDTDMode) GetMode() const = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDTD, NS_IDTD_IID)
@@ -98,6 +92,5 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIDTD, NS_IDTD_IID)
   void DidBuildModel() override;                                  \
   NS_IMETHOD BuildModel(nsIContentSink* aSink) override;          \
   NS_IMETHOD_(void) Terminate() override;                         \
-  NS_IMETHOD_(int32_t) GetType() override;                        \
-  NS_IMETHOD_(nsDTDMode) GetMode() const override;
+  NS_IMETHOD_(int32_t) GetType() override;
 #endif /* nsIDTD_h___ */
diff --git a/parser/htmlparser/nsParser.cpp b/parser/htmlparser/nsParser.cpp
index 339f02a71a3e..6088e8da46e1 100644
--- a/parser/htmlparser/nsParser.cpp
+++ b/parser/htmlparser/nsParser.cpp
@@ -367,7 +367,7 @@ nsresult nsParser::WillBuildModel() {
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mDTD->WillBuildModel(*mParserContext, mSink);
-  nsresult sinkResult = mSink->WillBuildModel(mDTD->GetMode());
+  nsresult sinkResult = mSink->WillBuildModel(mParserContext->mDTDMode);
   // nsIDTD::WillBuildModel used to be responsible for calling
   // nsIContentSink::WillBuildModel, but that obligation isn't expressible
   // in the nsIDTD interface itself, so it's sounder and simpler to give that