From 847cb0ed4dec293b5848608da3dde3536cd07d5d Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Thu, 20 Apr 2006 03:39:35 +0000 Subject: [PATCH] Fix assorted issues with fastback, including adding progress listener notifications and introducing the PageHide and PageShow events. See bug 292971 for all of the details. r=darin, sr=bzbarsky, a=shaver. git-svn-id: svn://10.0.0.236/trunk@194924 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDOMParser.cpp | 6 ------ mozilla/content/base/src/nsDOMParser.h | 1 - mozilla/content/base/src/nsLoadListenerProxy.cpp | 12 ------------ mozilla/content/base/src/nsLoadListenerProxy.h | 1 - mozilla/content/base/src/nsXMLHttpRequest.cpp | 6 ------ mozilla/content/base/src/nsXMLHttpRequest.h | 1 - 6 files changed, 27 deletions(-) diff --git a/mozilla/content/base/src/nsDOMParser.cpp b/mozilla/content/base/src/nsDOMParser.cpp index a5788dee8f3..f61a94eac5d 100644 --- a/mozilla/content/base/src/nsDOMParser.cpp +++ b/mozilla/content/base/src/nsDOMParser.cpp @@ -333,12 +333,6 @@ nsDOMParser::Error(nsIDOMEvent* aEvent) return NS_OK; } -NS_IMETHODIMP -nsDOMParser::PageRestore(nsIDOMEvent* aEvent) -{ - return NS_OK; -} - nsDOMParser::nsDOMParser() : mLoopingForSyncLoad(PR_FALSE) { diff --git a/mozilla/content/base/src/nsDOMParser.h b/mozilla/content/base/src/nsDOMParser.h index 4ab15930069..4fc7059bd8a 100644 --- a/mozilla/content/base/src/nsDOMParser.h +++ b/mozilla/content/base/src/nsDOMParser.h @@ -67,7 +67,6 @@ public: NS_IMETHOD Unload(nsIDOMEvent* aEvent); NS_IMETHOD Abort(nsIDOMEvent* aEvent); NS_IMETHOD Error(nsIDOMEvent* aEvent); - NS_IMETHOD PageRestore(nsIDOMEvent* aEvent); private: nsCOMPtr mBaseURI; diff --git a/mozilla/content/base/src/nsLoadListenerProxy.cpp b/mozilla/content/base/src/nsLoadListenerProxy.cpp index e4ecdb2dded..f1527e8fa4c 100644 --- a/mozilla/content/base/src/nsLoadListenerProxy.cpp +++ b/mozilla/content/base/src/nsLoadListenerProxy.cpp @@ -121,15 +121,3 @@ nsLoadListenerProxy::Error(nsIDOMEvent* aEvent) return NS_OK; } - -NS_IMETHODIMP -nsLoadListenerProxy::PageRestore(nsIDOMEvent* aEvent) -{ - nsCOMPtr listener(do_QueryReferent(mParent)); - - if (listener) { - return listener->PageRestore(aEvent); - } - - return NS_OK; -} diff --git a/mozilla/content/base/src/nsLoadListenerProxy.h b/mozilla/content/base/src/nsLoadListenerProxy.h index 10584725c87..d0582d53107 100644 --- a/mozilla/content/base/src/nsLoadListenerProxy.h +++ b/mozilla/content/base/src/nsLoadListenerProxy.h @@ -69,7 +69,6 @@ public: NS_IMETHOD Unload(nsIDOMEvent* aEvent); NS_IMETHOD Abort(nsIDOMEvent* aEvent); NS_IMETHOD Error(nsIDOMEvent* aEvent); - NS_IMETHOD PageRestore(nsIDOMEvent* aEvent); protected: nsWeakPtr mParent; diff --git a/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp index 5e181955d9a..f0e662f5a1e 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -1747,12 +1747,6 @@ nsXMLHttpRequest::Error(nsIDOMEvent* aEvent) return NS_OK; } -NS_IMETHODIMP -nsXMLHttpRequest::PageRestore(nsIDOMEvent* aEvent) -{ - return NS_OK; -} - nsresult nsXMLHttpRequest::ChangeState(PRUint32 aState, PRBool aBroadcast, PRBool aClearEventListeners) diff --git a/mozilla/content/base/src/nsXMLHttpRequest.h b/mozilla/content/base/src/nsXMLHttpRequest.h index 0a1eb44e869..c1a2421ac83 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.h +++ b/mozilla/content/base/src/nsXMLHttpRequest.h @@ -97,7 +97,6 @@ public: NS_IMETHOD Unload(nsIDOMEvent* aEvent); NS_IMETHOD Abort(nsIDOMEvent* aEvent); NS_IMETHOD Error(nsIDOMEvent* aEvent); - NS_IMETHOD PageRestore(nsIDOMEvent* aEvent); // nsIStreamListener NS_DECL_NSISTREAMLISTENER