From 5016ed76845307ee1264064bee77b8eed6eade80 Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Sat, 6 Mar 1999 01:48:11 +0000 Subject: [PATCH] Changed nsIContentSink->NotifyError() to accept an nsParserError argument. This change is needed for propagating errors from the new expat parser. git-svn-id: svn://10.0.0.236/trunk@23028 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp | 2 +- mozilla/htmlparser/src/nsHTMLContentSinkStream.h | 2 +- mozilla/htmlparser/src/nsHTMLNullSink.cpp | 4 ++-- mozilla/htmlparser/src/nsIContentSink.h | 3 ++- mozilla/htmlparser/src/nsLoggingSink.cpp | 4 ++-- mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp | 2 +- mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h | 2 +- mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp | 4 ++-- mozilla/parser/htmlparser/src/nsIContentSink.h | 3 ++- mozilla/parser/htmlparser/src/nsLoggingSink.cpp | 4 ++-- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp index d8804f8dff1..72974eec9b0 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -1046,7 +1046,7 @@ nsHTMLContentSinkStream::SetParser(nsIParser* aParser) { } NS_IMETHODIMP -nsHTMLContentSinkStream::NotifyError(nsresult aErrorResult) +nsHTMLContentSinkStream::NotifyError(const nsParserError* aError) { return NS_OK; } diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.h b/mozilla/htmlparser/src/nsHTMLContentSinkStream.h index 500105dac6b..da59c5c2e36 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.h +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.h @@ -93,7 +93,7 @@ class nsHTMLContentSinkStream : public nsIHTMLContentSink { NS_IMETHOD OpenContainer(const nsIParserNode& aNode); NS_IMETHOD CloseContainer(const nsIParserNode& aNode); NS_IMETHOD AddLeaf(const nsIParserNode& aNode); - NS_IMETHOD NotifyError(nsresult aErrorResult); + NS_IMETHOD NotifyError(const nsParserError* aError); NS_IMETHOD AddComment(const nsIParserNode& aNode); NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); diff --git a/mozilla/htmlparser/src/nsHTMLNullSink.cpp b/mozilla/htmlparser/src/nsHTMLNullSink.cpp index 2a1d3894b18..8de2dd9273a 100644 --- a/mozilla/htmlparser/src/nsHTMLNullSink.cpp +++ b/mozilla/htmlparser/src/nsHTMLNullSink.cpp @@ -47,7 +47,7 @@ public: NS_IMETHOD OpenContainer(const nsIParserNode& aNode); NS_IMETHOD CloseContainer(const nsIParserNode& aNode); NS_IMETHOD AddLeaf(const nsIParserNode& aNode); - NS_IMETHOD NotifyError(nsresult aErrorResult); + NS_IMETHOD NotifyError(const nsParserError* aError); NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); NS_IMETHOD AddComment(const nsIParserNode& aNode); @@ -578,7 +578,7 @@ nsHTMLNullSink::SetParser(nsIParser* aParser) } NS_IMETHODIMP -nsHTMLNullSink::NotifyError(nsresult aErrorResult) +nsHTMLNullSink::NotifyError(const nsParserError* aError) { return NS_OK; } diff --git a/mozilla/htmlparser/src/nsIContentSink.h b/mozilla/htmlparser/src/nsIContentSink.h index d0a1b1b1336..99e6f21c4ec 100644 --- a/mozilla/htmlparser/src/nsIContentSink.h +++ b/mozilla/htmlparser/src/nsIContentSink.h @@ -34,6 +34,7 @@ #include "nsIParserNode.h" #include "nsISupports.h" +#include "nsParserError.h" class nsIParser; @@ -139,7 +140,7 @@ public: * * @param aErrorResult the error code */ - NS_IMETHOD NotifyError(nsresult aErrorResult)=0; + NS_IMETHOD NotifyError(const nsParserError* aError)=0; }; #endif /* nsIContentSink_h___ */ diff --git a/mozilla/htmlparser/src/nsLoggingSink.cpp b/mozilla/htmlparser/src/nsLoggingSink.cpp index b013d42397e..b24c7078093 100644 --- a/mozilla/htmlparser/src/nsLoggingSink.cpp +++ b/mozilla/htmlparser/src/nsLoggingSink.cpp @@ -80,7 +80,7 @@ public: NS_IMETHOD OpenContainer(const nsIParserNode& aNode); NS_IMETHOD CloseContainer(const nsIParserNode& aNode); NS_IMETHOD AddLeaf(const nsIParserNode& aNode); - NS_IMETHOD NotifyError(nsresult aErrorResult); + NS_IMETHOD NotifyError(const nsParserError* aError); NS_IMETHOD AddComment(const nsIParserNode& aNode); NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); @@ -251,7 +251,7 @@ nsLoggingSink::AddLeaf(const nsIParserNode& aNode) } NS_IMETHODIMP -nsLoggingSink::NotifyError(nsresult aErrorResult) +nsLoggingSink::NotifyError(const nsParserError* aError) { return NS_OK; } diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp index d8804f8dff1..72974eec9b0 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -1046,7 +1046,7 @@ nsHTMLContentSinkStream::SetParser(nsIParser* aParser) { } NS_IMETHODIMP -nsHTMLContentSinkStream::NotifyError(nsresult aErrorResult) +nsHTMLContentSinkStream::NotifyError(const nsParserError* aError) { return NS_OK; } diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h index 500105dac6b..da59c5c2e36 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h @@ -93,7 +93,7 @@ class nsHTMLContentSinkStream : public nsIHTMLContentSink { NS_IMETHOD OpenContainer(const nsIParserNode& aNode); NS_IMETHOD CloseContainer(const nsIParserNode& aNode); NS_IMETHOD AddLeaf(const nsIParserNode& aNode); - NS_IMETHOD NotifyError(nsresult aErrorResult); + NS_IMETHOD NotifyError(const nsParserError* aError); NS_IMETHOD AddComment(const nsIParserNode& aNode); NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); diff --git a/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp b/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp index 2a1d3894b18..8de2dd9273a 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp @@ -47,7 +47,7 @@ public: NS_IMETHOD OpenContainer(const nsIParserNode& aNode); NS_IMETHOD CloseContainer(const nsIParserNode& aNode); NS_IMETHOD AddLeaf(const nsIParserNode& aNode); - NS_IMETHOD NotifyError(nsresult aErrorResult); + NS_IMETHOD NotifyError(const nsParserError* aError); NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); NS_IMETHOD AddComment(const nsIParserNode& aNode); @@ -578,7 +578,7 @@ nsHTMLNullSink::SetParser(nsIParser* aParser) } NS_IMETHODIMP -nsHTMLNullSink::NotifyError(nsresult aErrorResult) +nsHTMLNullSink::NotifyError(const nsParserError* aError) { return NS_OK; } diff --git a/mozilla/parser/htmlparser/src/nsIContentSink.h b/mozilla/parser/htmlparser/src/nsIContentSink.h index d0a1b1b1336..99e6f21c4ec 100644 --- a/mozilla/parser/htmlparser/src/nsIContentSink.h +++ b/mozilla/parser/htmlparser/src/nsIContentSink.h @@ -34,6 +34,7 @@ #include "nsIParserNode.h" #include "nsISupports.h" +#include "nsParserError.h" class nsIParser; @@ -139,7 +140,7 @@ public: * * @param aErrorResult the error code */ - NS_IMETHOD NotifyError(nsresult aErrorResult)=0; + NS_IMETHOD NotifyError(const nsParserError* aError)=0; }; #endif /* nsIContentSink_h___ */ diff --git a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp index b013d42397e..b24c7078093 100644 --- a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp +++ b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp @@ -80,7 +80,7 @@ public: NS_IMETHOD OpenContainer(const nsIParserNode& aNode); NS_IMETHOD CloseContainer(const nsIParserNode& aNode); NS_IMETHOD AddLeaf(const nsIParserNode& aNode); - NS_IMETHOD NotifyError(nsresult aErrorResult); + NS_IMETHOD NotifyError(const nsParserError* aError); NS_IMETHOD AddComment(const nsIParserNode& aNode); NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); @@ -251,7 +251,7 @@ nsLoggingSink::AddLeaf(const nsIParserNode& aNode) } NS_IMETHODIMP -nsLoggingSink::NotifyError(nsresult aErrorResult) +nsLoggingSink::NotifyError(const nsParserError* aError) { return NS_OK; }