From 47183725c75ae19148f1ee33f623c463a5d2e8a5 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Tue, 22 Jul 2003 18:38:08 +0000 Subject: [PATCH] Remove unused content quality stubs. b=111346 r+sr=bzbarsky --- content/base/src/mozSanitizingSerializer.h | 2 +- content/base/src/nsPlainTextSerializer.h | 2 +- .../html/document/src/nsHTMLContentSink.cpp | 19 ++------------ .../src/nsHTMLFragmentContentSink.cpp | 4 +-- .../document/src/nsLoadSaveContentSink.cpp | 4 +-- .../xml/document/src/nsLoadSaveContentSink.h | 2 +- content/xml/document/src/nsXMLContentSink.cpp | 16 +----------- content/xml/document/src/nsXMLContentSink.h | 2 +- content/xul/document/src/nsXULContentSink.cpp | 21 ++-------------- .../xslt/txMozillaStylesheetCompiler.cpp | 4 +-- htmlparser/public/nsIContentSink.h | 4 +-- htmlparser/robot/nsRobotSink.cpp | 2 +- htmlparser/src/CNavDTD.cpp | 8 +++--- htmlparser/src/COtherDTD.cpp | 2 +- htmlparser/src/nsExpatDriver.cpp | 7 ++++-- htmlparser/src/nsLoggingSink.cpp | 4 +-- htmlparser/src/nsLoggingSink.h | 2 +- htmlparser/src/nsViewSourceHTML.cpp | 2 +- parser/htmlparser/public/nsIContentSink.h | 4 +-- parser/htmlparser/robot/nsRobotSink.cpp | 2 +- parser/htmlparser/src/CNavDTD.cpp | 8 +++--- parser/htmlparser/src/COtherDTD.cpp | 2 +- parser/htmlparser/src/nsExpatDriver.cpp | 7 ++++-- parser/htmlparser/src/nsLoggingSink.cpp | 4 +-- parser/htmlparser/src/nsLoggingSink.h | 2 +- parser/htmlparser/src/nsViewSourceHTML.cpp | 2 +- rdf/base/src/nsRDFContentSink.cpp | 4 +-- view/public/nsIScrollableView.h | 18 ------------- view/public/nsIViewManager.h | 25 ------------------- view/src/nsScrollPortView.cpp | 15 ----------- view/src/nsScrollPortView.h | 4 --- view/src/nsViewManager.cpp | 24 ------------------ view/src/nsViewManager.h | 4 --- 33 files changed, 49 insertions(+), 183 deletions(-) diff --git a/content/base/src/mozSanitizingSerializer.h b/content/base/src/mozSanitizingSerializer.h index d68c68b67e2a..dd992ec85d41 100644 --- a/content/base/src/mozSanitizingSerializer.h +++ b/content/base/src/mozSanitizingSerializer.h @@ -94,7 +94,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void) { return NS_OK; } - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel) { return NS_OK; } + NS_IMETHOD DidBuildModel(void) { return NS_OK; } NS_IMETHOD WillInterrupt(void) { return NS_OK; } NS_IMETHOD WillResume(void) { return NS_OK; } NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; } diff --git a/content/base/src/nsPlainTextSerializer.h b/content/base/src/nsPlainTextSerializer.h index 6398cba20ecc..afa8f4bdfcad 100644 --- a/content/base/src/nsPlainTextSerializer.h +++ b/content/base/src/nsPlainTextSerializer.h @@ -91,7 +91,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void) { return NS_OK; } - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel) { return NS_OK; } + NS_IMETHOD DidBuildModel(void) { return NS_OK; } NS_IMETHOD WillInterrupt(void) { return NS_OK; } NS_IMETHOD WillResume(void) { return NS_OK; } NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; } diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp index a4fe12a7b77d..a6c720f0585f 100644 --- a/content/html/document/src/nsHTMLContentSink.cpp +++ b/content/html/document/src/nsHTMLContentSink.cpp @@ -241,7 +241,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(void); NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillResume(void); NS_IMETHOD SetParser(nsIParser* aParser); @@ -2687,7 +2687,7 @@ HTMLContentSink::WillBuildModel(void) } NS_IMETHODIMP -HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel) +HTMLContentSink::DidBuildModel(void) { // NRA Dump stopwatch stop info here @@ -2714,21 +2714,6 @@ HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel) domDoc->SetTitle(mTitle); } - // XXX this is silly; who cares? RickG cares. It's part of the - // regression test. So don't bug me. - PRInt32 i, ns = mDocument->GetNumberOfShells(); - for (i = 0; i < ns; i++) { - nsCOMPtr shell; - mDocument->GetShellAt(i, getter_AddRefs(shell)); - if (shell) { - nsCOMPtr vm; - nsresult rv = shell->GetViewManager(getter_AddRefs(vm)); - if (NS_SUCCEEDED(rv) && vm) { - vm->SetQuality(nsContentQuality(aQualityLevel)); - } - } - } - // Reflow the last batch of content if (mBody) { SINK_TRACE(SINK_TRACE_REFLOW, diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp index 78b492e3721f..2b60800eb382 100644 --- a/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -78,7 +78,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(void); NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillResume(void); NS_IMETHOD SetParser(nsIParser* aParser); @@ -281,7 +281,7 @@ nsHTMLFragmentContentSink::WillBuildModel(void) } NS_IMETHODIMP -nsHTMLFragmentContentSink::DidBuildModel(PRInt32 aQualityLevel) +nsHTMLFragmentContentSink::DidBuildModel(void) { FlushText(); diff --git a/content/xml/document/src/nsLoadSaveContentSink.cpp b/content/xml/document/src/nsLoadSaveContentSink.cpp index 454c46b298b0..7f0c352310a0 100644 --- a/content/xml/document/src/nsLoadSaveContentSink.cpp +++ b/content/xml/document/src/nsLoadSaveContentSink.cpp @@ -98,9 +98,9 @@ nsLoadSaveContentSink::WillBuildModel(void) } NS_IMETHODIMP -nsLoadSaveContentSink::DidBuildModel(PRInt32 aQualityLevel) +nsLoadSaveContentSink::DidBuildModel(void) { - return mBaseSink->DidBuildModel(aQualityLevel); + return mBaseSink->DidBuildModel(); } NS_IMETHODIMP diff --git a/content/xml/document/src/nsLoadSaveContentSink.h b/content/xml/document/src/nsLoadSaveContentSink.h index f5fe7261e7d8..28af8703122f 100644 --- a/content/xml/document/src/nsLoadSaveContentSink.h +++ b/content/xml/document/src/nsLoadSaveContentSink.h @@ -70,7 +70,7 @@ public: // nsILoadSaveContentSink NS_IMETHOD WillBuildModel(void); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(void); NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillResume(void); NS_IMETHOD SetParser(nsIParser* aParser); diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 35d7254ea88a..fbe911363e5e 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -393,22 +393,8 @@ nsXMLContentSink::MaybePrettyPrint() NS_IMETHODIMP -nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel) +nsXMLContentSink::DidBuildModel() { - // XXX this is silly; who cares? - PRInt32 i, ns = mDocument->GetNumberOfShells(); - for (i = 0; i < ns; i++) { - nsCOMPtr shell; - mDocument->GetShellAt(i, getter_AddRefs(shell)); - if (shell) { - nsCOMPtr vm; - shell->GetViewManager(getter_AddRefs(vm)); - if(vm) { - vm->SetQuality(nsContentQuality(aQualityLevel)); - } - } - } - if (mTitleText.IsEmpty()) { nsCOMPtr dom_doc(do_QueryInterface(mDocument)); if (dom_doc) { diff --git a/content/xml/document/src/nsXMLContentSink.h b/content/xml/document/src/nsXMLContentSink.h index 648ca95f9173..c482b58ffa38 100644 --- a/content/xml/document/src/nsXMLContentSink.h +++ b/content/xml/document/src/nsXMLContentSink.h @@ -101,7 +101,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(void); NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillResume(void); NS_IMETHOD SetParser(nsIParser* aParser); diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp index 7d3f80ba6962..96aa009487f3 100644 --- a/content/xul/document/src/nsXULContentSink.cpp +++ b/content/xul/document/src/nsXULContentSink.cpp @@ -131,7 +131,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(void); NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillResume(void); NS_IMETHOD SetParser(nsIParser* aParser); @@ -453,25 +453,8 @@ XULContentSinkImpl::WillBuildModel(void) } NS_IMETHODIMP -XULContentSinkImpl::DidBuildModel(PRInt32 aQualityLevel) +XULContentSinkImpl::DidBuildModel(void) { -#if FIXME - // XXX this is silly; who cares? - PRInt32 i, ns = mDocument->GetNumberOfShells(); - for (i = 0; i < ns; i++) { - nsCOMPtr shell; - mDocument->GetShellAt(i, getter_AddRefs(shell)); - if (nsnull != shell) { - nsIViewManager* vm; - shell->GetViewManager(&vm); - if(vm) { - vm->SetQuality(nsContentQuality(aQualityLevel)); - } - NS_RELEASE(vm); - } - } -#endif - nsCOMPtr doc = do_QueryReferent(mDocument); if (doc) { doc->EndLoad(); diff --git a/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp b/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp index 300899a6dd8f..9437e1d4bba2 100644 --- a/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp +++ b/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp @@ -106,7 +106,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void) { return NS_OK; } - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(); NS_IMETHOD WillInterrupt(void) { return NS_OK; } NS_IMETHOD WillResume(void) { return NS_OK; } NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; } @@ -237,7 +237,7 @@ txStylesheetSink::ReportError(const PRUnichar *aErrorText, } NS_IMETHODIMP -txStylesheetSink::DidBuildModel(PRInt32 aQualityLevel) +txStylesheetSink::DidBuildModel() { return mCompiler->doneLoading(); } diff --git a/htmlparser/public/nsIContentSink.h b/htmlparser/public/nsIContentSink.h index 6fead0ec8ecc..22a2bd272482 100644 --- a/htmlparser/public/nsIContentSink.h +++ b/htmlparser/public/nsIContentSink.h @@ -80,11 +80,9 @@ public: * This method gets called when the parser concludes the process * of building the content model via the content sink. * - * @param aQualityLevel describes how well formed the doc was. - * 0=GOOD; 1=FAIR; 2=POOR; * @update 5/7/98 gess */ - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel)=0; + NS_IMETHOD DidBuildModel()=0; /** * This method gets called when the parser gets i/o blocked, diff --git a/htmlparser/robot/nsRobotSink.cpp b/htmlparser/robot/nsRobotSink.cpp index 7e8b92211093..6187438b63a3 100644 --- a/htmlparser/robot/nsRobotSink.cpp +++ b/htmlparser/robot/nsRobotSink.cpp @@ -101,7 +101,7 @@ public: NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode); NS_IMETHOD WillBuildModel(void) { return NS_OK; } - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel) { return NS_OK; } + NS_IMETHOD DidBuildModel(void) { return NS_OK; } NS_IMETHOD WillInterrupt(void) { return NS_OK; } NS_IMETHOD WillResume(void) { return NS_OK; } NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; } diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp index 151bb5011977..ea8f9825626c 100644 --- a/htmlparser/src/CNavDTD.cpp +++ b/htmlparser/src/CNavDTD.cpp @@ -641,7 +641,7 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode, result = CloseContainersTo(mBodyContext->Last(), PR_FALSE); if (NS_FAILED(result)) { //No matter what, you need to call did build model. - aSink->DidBuildModel(0); + aSink->DidBuildModel(); return result; } } @@ -678,11 +678,11 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode, if (mComputedCRC32 != mExpectedCRC32) { if (mExpectedCRC32 != 0) { printf("CRC Computed: %u Expected CRC: %u\n,",mComputedCRC32,mExpectedCRC32); - result = aSink->DidBuildModel(2); + result = aSink->DidBuildModel(); } else { printf("Computed CRC: %u.\n",mComputedCRC32); - result = aSink->DidBuildModel(3); + result = aSink->DidBuildModel(); NS_ENSURE_SUCCESS(result, result); } } @@ -702,7 +702,7 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode, } //if aparser //No matter what, you need to call did build model. - return aSink->DidBuildModel(0); + return aSink->DidBuildModel(); } NS_IMETHODIMP_(void) diff --git a/htmlparser/src/COtherDTD.cpp b/htmlparser/src/COtherDTD.cpp index 5a36beb7078c..a50aa3dbecf3 100644 --- a/htmlparser/src/COtherDTD.cpp +++ b/htmlparser/src/COtherDTD.cpp @@ -471,7 +471,7 @@ nsresult COtherDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIPar } //if aparser //No matter what, you need to call did build model. - result = aSink->DidBuildModel(0); + result = aSink->DidBuildModel(); } //if asink return result; diff --git a/htmlparser/src/nsExpatDriver.cpp b/htmlparser/src/nsExpatDriver.cpp index 30b7ac68bac3..af4673fdac4b 100644 --- a/htmlparser/src/nsExpatDriver.cpp +++ b/htmlparser/src/nsExpatDriver.cpp @@ -1029,8 +1029,11 @@ nsExpatDriver::DidBuildModel(nsresult anErrorCode, { // Check for mSink is intentional. This would make sure // that DidBuildModel() is called only once on the sink. - nsresult result = (mSink)? aSink->DidBuildModel(0) : NS_OK; - NS_IF_RELEASE(mSink); + nsresult result = NS_OK; + if (mSink) { + result = aSink->DidBuildModel(); + NS_RELEASE(mSink); // assigns null + } return result; } diff --git a/htmlparser/src/nsLoggingSink.cpp b/htmlparser/src/nsLoggingSink.cpp index 31b77588a35d..32eb4aac4e2e 100644 --- a/htmlparser/src/nsLoggingSink.cpp +++ b/htmlparser/src/nsLoggingSink.cpp @@ -152,7 +152,7 @@ nsLoggingSink::WillBuildModel() { } NS_IMETHODIMP -nsLoggingSink::DidBuildModel(PRInt32 aQualityLevel) { +nsLoggingSink::DidBuildModel() { WriteTabs(mOutput,--mLevel); PR_fprintf(mOutput, "\n"); @@ -160,7 +160,7 @@ nsLoggingSink::DidBuildModel(PRInt32 aQualityLevel) { //proxy the call to the real sink if you have one. nsresult theResult=NS_OK; if(mSink) { - theResult=mSink->DidBuildModel(aQualityLevel); + theResult=mSink->DidBuildModel(); } return theResult; diff --git a/htmlparser/src/nsLoggingSink.h b/htmlparser/src/nsLoggingSink.h index 1c77753920c1..d21dd432c397 100644 --- a/htmlparser/src/nsLoggingSink.h +++ b/htmlparser/src/nsLoggingSink.h @@ -62,7 +62,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(); NS_IMETHOD WillInterrupt(); NS_IMETHOD WillResume(); NS_IMETHOD SetParser(nsIParser* aParser); diff --git a/htmlparser/src/nsViewSourceHTML.cpp b/htmlparser/src/nsViewSourceHTML.cpp index 9b1dff087f9f..bacbbe9b6c5e 100644 --- a/htmlparser/src/nsViewSourceHTML.cpp +++ b/htmlparser/src/nsViewSourceHTML.cpp @@ -784,7 +784,7 @@ NS_IMETHODIMP CViewSourceHTML::DidBuildModel(nsresult anErrorCode,PRBool aNotify nsCParserNode htmlNode(&htmlToken, 0/*stack token*/); mSink->CloseHTML(); } - result = mSink->DidBuildModel(1); + result = mSink->DidBuildModel(); } START_TIMER(); diff --git a/parser/htmlparser/public/nsIContentSink.h b/parser/htmlparser/public/nsIContentSink.h index 6fead0ec8ecc..22a2bd272482 100644 --- a/parser/htmlparser/public/nsIContentSink.h +++ b/parser/htmlparser/public/nsIContentSink.h @@ -80,11 +80,9 @@ public: * This method gets called when the parser concludes the process * of building the content model via the content sink. * - * @param aQualityLevel describes how well formed the doc was. - * 0=GOOD; 1=FAIR; 2=POOR; * @update 5/7/98 gess */ - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel)=0; + NS_IMETHOD DidBuildModel()=0; /** * This method gets called when the parser gets i/o blocked, diff --git a/parser/htmlparser/robot/nsRobotSink.cpp b/parser/htmlparser/robot/nsRobotSink.cpp index 7e8b92211093..6187438b63a3 100644 --- a/parser/htmlparser/robot/nsRobotSink.cpp +++ b/parser/htmlparser/robot/nsRobotSink.cpp @@ -101,7 +101,7 @@ public: NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode); NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode); NS_IMETHOD WillBuildModel(void) { return NS_OK; } - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel) { return NS_OK; } + NS_IMETHOD DidBuildModel(void) { return NS_OK; } NS_IMETHOD WillInterrupt(void) { return NS_OK; } NS_IMETHOD WillResume(void) { return NS_OK; } NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; } diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 151bb5011977..ea8f9825626c 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -641,7 +641,7 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode, result = CloseContainersTo(mBodyContext->Last(), PR_FALSE); if (NS_FAILED(result)) { //No matter what, you need to call did build model. - aSink->DidBuildModel(0); + aSink->DidBuildModel(); return result; } } @@ -678,11 +678,11 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode, if (mComputedCRC32 != mExpectedCRC32) { if (mExpectedCRC32 != 0) { printf("CRC Computed: %u Expected CRC: %u\n,",mComputedCRC32,mExpectedCRC32); - result = aSink->DidBuildModel(2); + result = aSink->DidBuildModel(); } else { printf("Computed CRC: %u.\n",mComputedCRC32); - result = aSink->DidBuildModel(3); + result = aSink->DidBuildModel(); NS_ENSURE_SUCCESS(result, result); } } @@ -702,7 +702,7 @@ nsresult CNavDTD::DidBuildModel(nsresult anErrorCode, } //if aparser //No matter what, you need to call did build model. - return aSink->DidBuildModel(0); + return aSink->DidBuildModel(); } NS_IMETHODIMP_(void) diff --git a/parser/htmlparser/src/COtherDTD.cpp b/parser/htmlparser/src/COtherDTD.cpp index 5a36beb7078c..a50aa3dbecf3 100644 --- a/parser/htmlparser/src/COtherDTD.cpp +++ b/parser/htmlparser/src/COtherDTD.cpp @@ -471,7 +471,7 @@ nsresult COtherDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIPar } //if aparser //No matter what, you need to call did build model. - result = aSink->DidBuildModel(0); + result = aSink->DidBuildModel(); } //if asink return result; diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/src/nsExpatDriver.cpp index 30b7ac68bac3..af4673fdac4b 100644 --- a/parser/htmlparser/src/nsExpatDriver.cpp +++ b/parser/htmlparser/src/nsExpatDriver.cpp @@ -1029,8 +1029,11 @@ nsExpatDriver::DidBuildModel(nsresult anErrorCode, { // Check for mSink is intentional. This would make sure // that DidBuildModel() is called only once on the sink. - nsresult result = (mSink)? aSink->DidBuildModel(0) : NS_OK; - NS_IF_RELEASE(mSink); + nsresult result = NS_OK; + if (mSink) { + result = aSink->DidBuildModel(); + NS_RELEASE(mSink); // assigns null + } return result; } diff --git a/parser/htmlparser/src/nsLoggingSink.cpp b/parser/htmlparser/src/nsLoggingSink.cpp index 31b77588a35d..32eb4aac4e2e 100644 --- a/parser/htmlparser/src/nsLoggingSink.cpp +++ b/parser/htmlparser/src/nsLoggingSink.cpp @@ -152,7 +152,7 @@ nsLoggingSink::WillBuildModel() { } NS_IMETHODIMP -nsLoggingSink::DidBuildModel(PRInt32 aQualityLevel) { +nsLoggingSink::DidBuildModel() { WriteTabs(mOutput,--mLevel); PR_fprintf(mOutput, "\n"); @@ -160,7 +160,7 @@ nsLoggingSink::DidBuildModel(PRInt32 aQualityLevel) { //proxy the call to the real sink if you have one. nsresult theResult=NS_OK; if(mSink) { - theResult=mSink->DidBuildModel(aQualityLevel); + theResult=mSink->DidBuildModel(); } return theResult; diff --git a/parser/htmlparser/src/nsLoggingSink.h b/parser/htmlparser/src/nsLoggingSink.h index 1c77753920c1..d21dd432c397 100644 --- a/parser/htmlparser/src/nsLoggingSink.h +++ b/parser/htmlparser/src/nsLoggingSink.h @@ -62,7 +62,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(); NS_IMETHOD WillInterrupt(); NS_IMETHOD WillResume(); NS_IMETHOD SetParser(nsIParser* aParser); diff --git a/parser/htmlparser/src/nsViewSourceHTML.cpp b/parser/htmlparser/src/nsViewSourceHTML.cpp index 9b1dff087f9f..bacbbe9b6c5e 100644 --- a/parser/htmlparser/src/nsViewSourceHTML.cpp +++ b/parser/htmlparser/src/nsViewSourceHTML.cpp @@ -784,7 +784,7 @@ NS_IMETHODIMP CViewSourceHTML::DidBuildModel(nsresult anErrorCode,PRBool aNotify nsCParserNode htmlNode(&htmlToken, 0/*stack token*/); mSink->CloseHTML(); } - result = mSink->DidBuildModel(1); + result = mSink->DidBuildModel(); } START_TIMER(); diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/src/nsRDFContentSink.cpp index 7cbc4668e775..eff525c6e8bb 100644 --- a/rdf/base/src/nsRDFContentSink.cpp +++ b/rdf/base/src/nsRDFContentSink.cpp @@ -156,7 +156,7 @@ public: // nsIContentSink NS_IMETHOD WillBuildModel(void); - NS_IMETHOD DidBuildModel(PRInt32 aQualityLevel); + NS_IMETHOD DidBuildModel(void); NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillResume(void); NS_IMETHOD SetParser(nsIParser* aParser); @@ -665,7 +665,7 @@ RDFContentSinkImpl::WillBuildModel(void) } NS_IMETHODIMP -RDFContentSinkImpl::DidBuildModel(PRInt32 aQualityLevel) +RDFContentSinkImpl::DidBuildModel(void) { if (mDataSource) { nsCOMPtr sink = do_QueryInterface(mDataSource); diff --git a/view/public/nsIScrollableView.h b/view/public/nsIScrollableView.h index 3e97251af082..aae969f16930 100644 --- a/view/public/nsIScrollableView.h +++ b/view/public/nsIScrollableView.h @@ -115,24 +115,6 @@ public: */ NS_IMETHOD GetScrolledView(nsIView *&aScrolledView) const = 0; - /** - * Select whether quality level should be displayed in view frame - * @param aShow if PR_TRUE, quality level will be displayed, else hidden - */ - NS_IMETHOD ShowQuality(PRBool aShow) = 0; - - /** - * Query whether quality level should be displayed in view frame - * @return if PR_TRUE, quality level will be displayed, else hidden - */ - NS_IMETHOD GetShowQuality(PRBool &aShow) const = 0; - - /** - * Select whether quality level should be displayed in view frame - * @param aShow if PR_TRUE, quality level will be displayed, else hidden - */ - NS_IMETHOD SetQuality(nsContentQuality aQuality) = 0; - /** * Select whether scroll bars should be displayed all the time, never or * only when necessary. diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h index 5fc0de3084cf..0a0c835b199c 100644 --- a/view/public/nsIViewManager.h +++ b/view/public/nsIViewManager.h @@ -51,13 +51,6 @@ class nsRegion; class nsIDeviceContext; class nsIViewObserver; -enum nsContentQuality { - nsContentQuality_kGood = 0, - nsContentQuality_kFair, - nsContentQuality_kPoor, - nsContentQuality_kUnknown -}; - enum nsRectVisibility { nsRectVisibility_kVisible, nsRectVisibility_kAboveViewport, @@ -360,24 +353,6 @@ public: */ NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext) = 0; - /** - * Select whether quality level should be displayed in root view - * @param aShow if PR_TRUE, quality level will be displayed, else hidden - */ - NS_IMETHOD ShowQuality(PRBool aShow) = 0; - - /** - * Query whether quality level should be displayed in view frame - * @return if PR_TRUE, quality level will be displayed, else hidden - */ - NS_IMETHOD GetShowQuality(PRBool &aResult) = 0; - - /** - * Select quality level - * @param aShow if PR_TRUE, quality level will be displayed, else hidden - */ - NS_IMETHOD SetQuality(nsContentQuality aQuality) = 0; - /** * prevent the view manager from refreshing. * @return error status diff --git a/view/src/nsScrollPortView.cpp b/view/src/nsScrollPortView.cpp index 47852d1dbd68..7ddffc7ffc6b 100644 --- a/view/src/nsScrollPortView.cpp +++ b/view/src/nsScrollPortView.cpp @@ -207,21 +207,6 @@ NS_IMETHODIMP nsScrollPortView::GetContainerSize(nscoord *aWidth, nscoord *aHeig return NS_OK; } -NS_IMETHODIMP nsScrollPortView::ShowQuality(PRBool aShow) -{ - return NS_OK; -} - -NS_IMETHODIMP nsScrollPortView::GetShowQuality(PRBool &aShow) const -{ - return NS_OK; -} - -NS_IMETHODIMP nsScrollPortView::SetQuality(nsContentQuality aQuality) -{ - return NS_OK; -} - NS_IMETHODIMP nsScrollPortView::SetScrollPreference(nsScrollPreference aPref) { return NS_OK; diff --git a/view/src/nsScrollPortView.h b/view/src/nsScrollPortView.h index c82251adaddf..0ca024c72b1b 100644 --- a/view/src/nsScrollPortView.h +++ b/view/src/nsScrollPortView.h @@ -66,10 +66,6 @@ public: NS_IMETHOD SetScrolledView(nsIView *aScrolledView); NS_IMETHOD GetScrolledView(nsIView *&aScrolledView) const; - NS_IMETHOD ShowQuality(PRBool aShow); - NS_IMETHOD GetShowQuality(PRBool &aShow) const; - NS_IMETHOD SetQuality(nsContentQuality aQuality); - NS_IMETHOD SetScrollPreference(nsScrollPreference aPref); NS_IMETHOD GetScrollPreference(nsScrollPreference &aScrollPreference) const; NS_IMETHOD GetScrollPosition(nscoord &aX, nscoord &aY) const; diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp index bfd5a2870f54..59508003b46d 100644 --- a/view/src/nsViewManager.cpp +++ b/view/src/nsViewManager.cpp @@ -3115,30 +3115,6 @@ const nsVoidArray* nsViewManager::GetViewManagerArray() return gViewManagers; } -NS_IMETHODIMP nsViewManager::ShowQuality(PRBool aShow) -{ - if (nsnull != mRootScrollable) - mRootScrollable->ShowQuality(aShow); - - return NS_OK; -} - -NS_IMETHODIMP nsViewManager::GetShowQuality(PRBool &aResult) -{ - if (nsnull != mRootScrollable) - mRootScrollable->GetShowQuality(aResult); - - return NS_OK; -} - -NS_IMETHODIMP nsViewManager::SetQuality(nsContentQuality aQuality) -{ - if (nsnull != mRootScrollable) - mRootScrollable->SetQuality(aQuality); - - return NS_OK; -} - nsIRenderingContext * nsViewManager::CreateRenderingContext(nsView &aView) { nsView *par = &aView; diff --git a/view/src/nsViewManager.h b/view/src/nsViewManager.h index c2512c3e3a1d..cc084e65754e 100644 --- a/view/src/nsViewManager.h +++ b/view/src/nsViewManager.h @@ -186,10 +186,6 @@ public: NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext); - NS_IMETHOD ShowQuality(PRBool aShow); - NS_IMETHOD GetShowQuality(PRBool &aResult); - NS_IMETHOD SetQuality(nsContentQuality aQuality); - NS_IMETHOD DisableRefresh(void); NS_IMETHOD EnableRefresh(PRUint32 aUpdateFlags);