From 2406d753fa103e213d7ab497664d184e11409ceb Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Mon, 15 Aug 2005 22:39:29 +0000 Subject: [PATCH] Bug 78510. Retry backing out of link-visited notifications, to see how Tp is affected. r+sr=bz git-svn-id: svn://10.0.0.236/trunk@177788 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 87427bc9d10..d2c3726b805 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -66,7 +66,6 @@ #include "nsIWebBrowserChrome.h" #include "nsPoint.h" #include "nsGfxCIID.h" -#include "nsIObserverService.h" #include "nsIPrompt.h" #include "nsIAuthPrompt.h" #include "nsTextFormatter.h" @@ -7848,27 +7847,13 @@ NS_IMETHODIMP nsDocShell::MakeEditable(PRBool inWaitForUriLoad) nsresult nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect, nsIURI * aReferrer) { - if (mItemType != typeContent || !mGlobalHistory) + if (mItemType != typeContent) return NS_OK; - PRBool visited; - nsresult rv = mGlobalHistory->IsVisited(aURI, &visited); - if (NS_FAILED(rv)) - return rv; - - rv = mGlobalHistory->AddURI(aURI, aRedirect, !IsFrame(), aReferrer); - if (NS_FAILED(rv)) - return rv; + if (!mGlobalHistory) + return NS_OK; - if (!visited) { - nsCOMPtr obsService = - do_GetService("@mozilla.org/observer-service;1"); - if (obsService) { - obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nsnull); - } - } - - return NS_OK; + return mGlobalHistory->AddURI(aURI, aRedirect, !IsFrame(), aReferrer); } //*****************************************************************************