From 03c6284ffe4b52b37271ef5291766d5ad720f115 Mon Sep 17 00:00:00 2001
From: "depstein%netscape.com" <depstein%netscape.com>
Date: Tue, 25 Jun 2002 00:41:01 +0000
Subject: [PATCH] added support for webProgress flags for
 AddWebProgressListener()

---
 embedding/qa/testembed/nsIWebNav.cpp  |  6 +-
 embedding/qa/testembed/nsIWebNav.h    |  6 +-
 embedding/qa/testembed/nsIWebProg.cpp | 82 +++++++++++++++++++++++++--
 embedding/qa/testembed/nsIWebProg.h   |  2 +-
 4 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/embedding/qa/testembed/nsIWebNav.cpp b/embedding/qa/testembed/nsIWebNav.cpp
index 6962298b57b..4ea65e12cf8 100644
--- a/embedding/qa/testembed/nsIWebNav.cpp
+++ b/embedding/qa/testembed/nsIWebNav.cpp
@@ -268,7 +268,7 @@ void CNsIWebNav::GoToIndexTest()
    RvTestResult(rv, "GotoIndex() test", 2);
 }
 
-void CNsIWebNav::LoadUriTest(char *theUrl, const unsigned long theFlag)
+void CNsIWebNav::LoadUriTest(char *theUrl, PRUint32 theFlag)
 {
    char theTotalString[500];
    char theFlagName[200];
@@ -313,7 +313,7 @@ void CNsIWebNav::LoadUriTest(char *theUrl, const unsigned long theFlag)
    RvTestResult(rv, theTotalString, 2);
 }
 
-void CNsIWebNav::ReloadTest(const unsigned long theFlag)
+void CNsIWebNav::ReloadTest(PRUint32 theFlag)
 {
    char theTotalString[500];
    char theFlagName[200];
@@ -357,7 +357,7 @@ void CNsIWebNav::ReloadTest(const unsigned long theFlag)
    RvTestResult(rv, theTotalString, 1);
 }
 
-void CNsIWebNav::StopUriTest(char *theUrl, const unsigned long theFlag)
+void CNsIWebNav::StopUriTest(char *theUrl, PRUint32 theFlag)
 {
    char theTotalString[200];
    char flagString[100];
diff --git a/embedding/qa/testembed/nsIWebNav.h b/embedding/qa/testembed/nsIWebNav.h
index 9355d77d4cb..4cede2ccc2a 100644
--- a/embedding/qa/testembed/nsIWebNav.h
+++ b/embedding/qa/testembed/nsIWebNav.h
@@ -72,9 +72,9 @@ public:
 	void CanGoForwardTest();
 	void GoForwardTest();
 	void GoToIndexTest();
-	void LoadUriTest(char *, const unsigned long);
-	void ReloadTest(const unsigned long);
-	void StopUriTest(char *, const unsigned long);
+	void LoadUriTest(char *, PRUint32);
+	void ReloadTest(PRUint32);
+	void StopUriTest(char *, PRUint32);
 	void GetDocumentTest(void);
 	void GetCurrentURITest(void);
 	void GetSHTest(void);
diff --git a/embedding/qa/testembed/nsIWebProg.cpp b/embedding/qa/testembed/nsIWebProg.cpp
index 6d08be03453..378d0a5ce9c 100644
--- a/embedding/qa/testembed/nsIWebProg.cpp
+++ b/embedding/qa/testembed/nsIWebProg.cpp
@@ -88,14 +88,50 @@ nsIWebProgress * CnsiWebProg::GetWebProgObject()
 	}
 }
 
-void CnsiWebProg::AddWebProgLstnr()
+void CnsiWebProg::AddWebProgLstnr(PRUint32 theFlag)
 {
+	char flagName[200];
+
+	switch(theFlag)
+	{
+	case nsIWebProgress::NOTIFY_STATE_REQUEST:
+		strcpy(flagName, "NOTIFY_STATE_REQUEST");
+		break;
+	case nsIWebProgress::NOTIFY_STATE_DOCUMENT:
+		strcpy(flagName, "NOTIFY_STATE_DOCUMENT");
+		break;
+	case nsIWebProgress::NOTIFY_STATE_NETWORK:
+		strcpy(flagName, "NOTIFY_STATE_NETWORK");
+		break;
+	case nsIWebProgress::NOTIFY_STATE_WINDOW:
+		strcpy(flagName, "NOTIFY_STATE_WINDOW");
+		break;
+	case nsIWebProgress::NOTIFY_STATE_ALL:
+		strcpy(flagName, "NOTIFY_STATE_ALL");
+		break;
+	case nsIWebProgress::NOTIFY_PROGRESS:
+		strcpy(flagName, "NOTIFY_PROGRESS");
+		break;
+	case nsIWebProgress::NOTIFY_STATUS:
+		strcpy(flagName, "NOTIFY_STATUS");
+		break;
+	case nsIWebProgress::NOTIFY_SECURITY:
+		strcpy(flagName, "NOTIFY_SECURITY");
+		break;
+	case nsIWebProgress::NOTIFY_LOCATION:
+		strcpy(flagName, "NOTIFY_LOCATION");
+		break;
+	case nsIWebProgress::NOTIFY_ALL:
+		strcpy(flagName, "NOTIFY_ALL");
+		break;
+	}
 			// addWebProgListener
 	nsCOMPtr<nsIWebProgress> qaWebProgress;
 	qaWebProgress = GetWebProgObject();
 	nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl));
-	rv = qaWebProgress->AddProgressListener(listener, nsIWebProgress::NOTIFY_ALL);
+	rv = qaWebProgress->AddProgressListener(listener, theFlag);
 	RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", 2);
+	FormatAndPrintOutput("WebProgressListener flag = ", flagName, 2);
 }
 
 void CnsiWebProg::RemoveWebProgLstnr()
@@ -129,7 +165,7 @@ void CnsiWebProg::OnStartTests(UINT nMenuID)
 			RunAllTests();
 			break ;
 		case ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER :
-			AddWebProgLstnr();
+			AddWebProgLstnr(nsIWebProgress::NOTIFY_ALL);
 			break ;
 		case ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER :
 			RemoveWebProgLstnr();
@@ -142,8 +178,44 @@ void CnsiWebProg::OnStartTests(UINT nMenuID)
 
 void CnsiWebProg::RunAllTests(void)
 {
-	AddWebProgLstnr();
-	RemoveWebProgLstnr();
+	int i;
+	PRUint32 theFlag = 0x000000ff;
+	for (i = 0; i < 10; i++) {
+		switch(i) {
+		case 0:
+			theFlag = nsIWebProgress::NOTIFY_STATE_REQUEST;
+			break;
+		case 1:
+			theFlag = nsIWebProgress::NOTIFY_STATE_DOCUMENT;
+			break;
+		case 2:
+			theFlag = nsIWebProgress::NOTIFY_STATE_NETWORK;
+			break;
+		case 3:
+			theFlag = nsIWebProgress::NOTIFY_STATE_WINDOW;
+			break;
+		case 4:
+			theFlag = nsIWebProgress::NOTIFY_STATE_ALL;
+			break;
+		case 5:
+			theFlag = nsIWebProgress::NOTIFY_PROGRESS;
+			break;
+		case 6:
+			theFlag = nsIWebProgress::NOTIFY_STATUS;
+			break;
+		case 7:
+			theFlag = nsIWebProgress::NOTIFY_SECURITY;
+			break;
+		case 8:
+			theFlag = nsIWebProgress::NOTIFY_LOCATION;
+			break;
+		case 9:
+			theFlag = nsIWebProgress::NOTIFY_ALL;
+			break;
+		}
+		AddWebProgLstnr(theFlag);
+		RemoveWebProgLstnr();
+	}
 	GetTheDOMWindow();
 }
 
diff --git a/embedding/qa/testembed/nsIWebProg.h b/embedding/qa/testembed/nsIWebProg.h
index 21082db16f6..1af1db29000 100644
--- a/embedding/qa/testembed/nsIWebProg.h
+++ b/embedding/qa/testembed/nsIWebProg.h
@@ -26,7 +26,7 @@ public:
 	CnsiWebProg(nsIWebBrowser *mWebBrowser,
 				   CBrowserImpl *mpBrowserImpl);
 	nsIWebProgress * GetWebProgObject();
-	void AddWebProgLstnr(void);
+	void AddWebProgLstnr(PRUint32);
 	void RemoveWebProgLstnr(void);
 	void GetTheDOMWindow(void);