diff --git a/docshell/shistory/ChildSHistory.cpp b/docshell/shistory/ChildSHistory.cpp index 87b6a7b3fc4b..85ce41427b7f 100644 --- a/docshell/shistory/ChildSHistory.cpp +++ b/docshell/shistory/ChildSHistory.cpp @@ -237,7 +237,7 @@ void ChildSHistory::RemovePendingHistoryNavigations() { void ChildSHistory::EvictLocalContentViewers() { if (!mozilla::SessionHistoryInParent()) { - mHistory->EvictAllContentViewers(); + mHistory->EvictAllDocumentViewers(); } } diff --git a/docshell/shistory/nsISHistory.idl b/docshell/shistory/nsISHistory.idl index 8ea23693d92a..282eb966bc05 100644 --- a/docshell/shistory/nsISHistory.idl +++ b/docshell/shistory/nsISHistory.idl @@ -209,7 +209,7 @@ interface nsISHistory: nsISupports /** * Evict all the content viewers in this session history */ - void evictAllContentViewers(); + void evictAllDocumentViewers(); /** * Add a BFCache entry to expiration tracker so it gets evicted on diff --git a/docshell/shistory/nsSHistory.cpp b/docshell/shistory/nsSHistory.cpp index 0854533962a2..17b7001508ea 100644 --- a/docshell/shistory/nsSHistory.cpp +++ b/docshell/shistory/nsSHistory.cpp @@ -1208,7 +1208,7 @@ nsSHistory::EvictContentViewersOrReplaceEntry(nsISHEntry* aNewSHEntry, } NS_IMETHODIMP -nsSHistory::EvictAllContentViewers() { +nsSHistory::EvictAllDocumentViewers() { // XXXbz we don't actually do a good job of evicting things as we should, so // we might have viewers quite far from mIndex. So just evict everything. for (int32_t i = 0; i < Length(); i++) { diff --git a/docshell/test/navigation/file_bug1326251_evict_cache.html b/docshell/test/navigation/file_bug1326251_evict_cache.html index b9873947f41e..d81f948d89f9 100644 --- a/docshell/test/navigation/file_bug1326251_evict_cache.html +++ b/docshell/test/navigation/file_bug1326251_evict_cache.html @@ -6,7 +6,7 @@