Bug 1749935 - Remove nsIDTD::GetMode. r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D135848
This commit is contained in:
Peter Van der Beken 2022-02-14 13:03:47 +00:00
Родитель 2e5c4bc0ad
Коммит bb4612daad
4 изменённых файлов: 2 добавлений и 15 удалений

Просмотреть файл

@ -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; }

Просмотреть файл

@ -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) {

Просмотреть файл

@ -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___ */

Просмотреть файл

@ -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