Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 285648: url from subframe load could show in Camino's url bar. Fix by ignoring OnLocationChange for windows other than the content window.

Browse Source
This commit is contained in:
smfr%smfr.org 2005-03-21 02:37:29 +00:00
parent 5eda45ec6c
commit 68c673e895
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
camino/src/embedding/CHBrowserListener.mm
View File

@ -19,7 +19,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Simon Fraser <sfraser@netscape.com>
* Simon Fraser <smfr@smfr.org>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -40,19 +40,22 @@
#import "NSString+Utils.h"
// Embedding includes
#include "nsIWebBrowser.h"
#include "nsIWebNavigation.h"
#include "nsIWebProgress.h"
#include "nsIURI.h"
#include "nsIDOMWindow.h"
//#include "nsIWidget.h"
#include "nsIDOMPopupBlockedEvent.h"
// XPCOM and String includes
#include "nsIInterfaceRequestorUtils.h"
#include "nsIRequest.h"
#include "nsCRT.h"
#include "nsString.h"
#include "nsCOMPtr.h"
#include "nsIDOMPopupBlockedEvent.h"
#include "nsNetError.h"
#import "CHBrowserView.h"
#include "CHBrowserListener.h"
@ -568,13 +571,20 @@ CHBrowserListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aR
/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
NS_IMETHODIMP
CHBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest,
nsIURI *location)
nsIURI *aLocation)
{
if (!location)
if (!aLocation || !aWebProgress)
return NS_ERROR_FAILURE;
// only pay attention to location change for our nsIDOMWindow
nsCOMPtr<nsIDOMWindow> windowForProgress;
aWebProgress->GetDOMWindow(getter_AddRefs(windowForProgress));
nsCOMPtr<nsIDOMWindow> ourWindow = do_GetInterface(NS_STATIC_CAST(nsIInterfaceRequestor*, this));
if (windowForProgress != ourWindow)
return NS_OK;
nsCAutoString spec;
location->GetSpec(spec);
aLocation->GetSpec(spec);
NSString* str = [NSString stringWithUTF8String:spec.get()];
NSEnumerator* enumerator = [mListeners objectEnumerator];