From 962f3e4dfd5c6509b7b6e38bf27c949fa7835b39 Mon Sep 17 00:00:00 2001 From: kipp Date: Mon, 1 Jun 1998 19:53:19 +0000 Subject: [PATCH] Updated LoadURL API to take an nsIStreamListener; pass on listener to parser git-svn-id: svn://10.0.0.236/trunk@2827 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsHTMLDocument.cpp | 9 ++++++--- mozilla/layout/html/document/src/nsHTMLDocument.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 36832987494..b579a432d38 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -72,7 +72,9 @@ NS_IMETHODIMP nsHTMLDocument::QueryInterface(REFNSIID aIID, return nsDocument::QueryInterface(aIID, aInstancePtr); } -void nsHTMLDocument::LoadURL(nsIURL* aURL, nsIPostData* aPostData) +NS_IMETHODIMP +nsHTMLDocument::LoadURL(nsIURL* aURL, nsIStreamListener* aListener, + nsIPostData* aPostData) { // Delete references to style sheets - this should be done in superclass... PRInt32 index = mStyleSheets.Count(); @@ -123,12 +125,13 @@ void nsHTMLDocument::LoadURL(nsIURL* aURL, nsIPostData* aPostData) } parser->SetContentSink(sink); - parser->Parse(aURL); + parser->Parse(aURL, aListener); NS_RELEASE(sink); } NS_RELEASE(parser); } - //XXX return NS_OK; + + return rv; } static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENTOBSERVER_IID); diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 36832987494..b579a432d38 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -72,7 +72,9 @@ NS_IMETHODIMP nsHTMLDocument::QueryInterface(REFNSIID aIID, return nsDocument::QueryInterface(aIID, aInstancePtr); } -void nsHTMLDocument::LoadURL(nsIURL* aURL, nsIPostData* aPostData) +NS_IMETHODIMP +nsHTMLDocument::LoadURL(nsIURL* aURL, nsIStreamListener* aListener, + nsIPostData* aPostData) { // Delete references to style sheets - this should be done in superclass... PRInt32 index = mStyleSheets.Count(); @@ -123,12 +125,13 @@ void nsHTMLDocument::LoadURL(nsIURL* aURL, nsIPostData* aPostData) } parser->SetContentSink(sink); - parser->Parse(aURL); + parser->Parse(aURL, aListener); NS_RELEASE(sink); } NS_RELEASE(parser); } - //XXX return NS_OK; + + return rv; } static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENTOBSERVER_IID);