Remove historyMaxTotalViewers from nsISHistoryInternal, and just use a static getter on nsSHistory instead. Bug 310597, r=marria@gmail.com, sr=darin.

git-svn-id: svn://10.0.0.236/trunk@181414 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2005-10-01 20:38:47 +00:00
parent 84a3e2377d
commit d917fde32a
5 changed files with 17 additions and 30 deletions

View File

@@ -101,6 +101,7 @@
#include "nsDocShellLoadInfo.h"
#include "nsCDefaultURIFixup.h"
#include "nsDocShellEnumerator.h"
#include "nsSHistory.h"
// Helper Classes
#include "nsDOMError.h"
@@ -4964,15 +4965,8 @@ nsDocShell::CanSavePresentation(PRUint32 aLoadType,
// Avoid doing the work of saving the presentation state in the case where
// the content viewer cache is disabled.
nsCOMPtr<nsISHistory> rootSH;
GetRootSessionHistory(getter_AddRefs(rootSH));
if (rootSH) {
nsCOMPtr<nsISHistoryInternal> shistInt(do_QueryInterface(rootSH));
PRInt32 maxViewers;
shistInt->GetHistoryMaxTotalViewers(&maxViewers);
if (maxViewers == 0)
if (nsSHistory::GetMaxTotalViewers() == 0)
return PR_FALSE;
}
// Don't cache the content viewer if we're in a subframe and the subframe
// pref is disabled.