Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed doc-observer LoadURL method and fixedup progress printf's and start throbber at a better time

Browse Source
This commit is contained in:
kipp%netscape.com 1998-07-17 15:30:59 +00:00
parent 46e4c791ae
commit d5d6ee498a
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webshell/tests/viewer/nsViewer.cpp
View File

@ -369,6 +369,7 @@ DocObserver::QueryInterface(const nsIID& aIID,
return NS_NOINTERFACE;
}
#if 0
nsresult
DocObserver::LoadURL(const nsString& aURLSpec,
const char* aCommand,
@ -398,6 +399,7 @@ DocObserver::LoadURL(const nsString& aURLSpec,
return mDocLoader->LoadURL(aURLSpec, aCommand, aContainer,
aPostData, aExtraInfo, anObserver);
}
#endif
// Pass title information through to all of the web widgets that
// belong to this document.
@ -499,7 +501,11 @@ NS_IMETHODIMP
DocObserver::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax,
const nsString& aMsg)
{
fputs(mURL, stdout);
if (nsnull != aURL) {
nsAutoString url;
aURL->ToString(url);
fputs(url, stdout);
}
printf(": progress %d", aProgress);
if (0 != aProgressMax) {
printf(" (out of %d)", aProgressMax);
@ -511,11 +517,11 @@ DocObserver::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax,
NS_IMETHODIMP
DocObserver::OnStartBinding(nsIURL* aURL, const char *aContentType)
{
//start the throbber...
if (nsnull != mViewer)
mViewer->mUpdateThrobber = PR_TRUE;
fputs(mURL, stdout);
if (nsnull != aURL) {
nsAutoString url;
aURL->ToString(url);
fputs(url, stdout);
}
fputs(": start\n", stdout);
return NS_OK;
}
@ -523,7 +529,11 @@ DocObserver::OnStartBinding(nsIURL* aURL, const char *aContentType)
NS_IMETHODIMP
DocObserver::OnStopBinding(nsIURL* aURL, PRInt32 status, const nsString& aMsg)
{
fputs(mURL, stdout);
if (nsnull != aURL) {
nsAutoString url;
aURL->ToString(url);
fputs(url, stdout);
}
fputs(": stop\n", stdout);
#ifdef VIEWER_UI
@ -1560,6 +1570,7 @@ nsViewer::Back()
mHistoryIndex--;
if (nsnull != mWD && nsnull != mWD->observer) {
nsString* s = (nsString*) mHistory.ElementAt(mHistoryIndex);
mUpdateThrobber = PR_TRUE; //start the throbber...
mWD->observer->mWebWidget->LoadURL(*s, mWD->observer, nsnull);
}
ShowHistory();
@ -1584,6 +1595,7 @@ nsViewer::Forward()
mHistoryIndex++;
if (nsnull != mWD && nsnull != mWD->observer) {
nsString* s = (nsString*) mHistory.ElementAt(mHistoryIndex);
mUpdateThrobber = PR_TRUE; //start the throbber...
mWD->observer->mWebWidget->LoadURL(*s, mWD->observer, nsnull);
}
ShowHistory();
@ -1623,6 +1635,8 @@ nsViewer::GoTo(const nsString& aURLSpec,
mLocation->RemoveText();
mLocation->SetText(aURLSpec);
mUpdateThrobber = PR_TRUE; //start the throbber...
rv = aWebWidget->LoadURL(aURLSpec, anObserver, aPostData);
}
return rv;

8
webshell/tests/viewer/nsViewer.h
View File

@ -117,13 +117,6 @@ public:
const nsString& aTargetSpec,
nsIPostData* aPostDat = 0);
nsresult LoadURL(const nsString& aURLSpec,
const char* aCommand,
nsIViewerContainer* aContainer,
nsIPostData* aPostData,
nsISupports* aExtraInfo,
nsIStreamObserver* anObserver);
nsIWebWidget* mWebWidget;
nsIWidget* mWindowWidget;
nsViewer* mViewer;
@ -135,7 +128,6 @@ public:
protected:
virtual ~DocObserver();
nsString mURL;
nsString mOverURL;
nsString mOverTarget;
};