зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1865891 p7. Rename EvictLocalContentViewers to match nsIDocumentViewer's new name. r=emilio
Depends on D194279 Differential Revision: https://phabricator.services.mozilla.com/D194280
This commit is contained in:
Родитель
7ba3a711d7
Коммит
742ed330df
|
@ -4543,7 +4543,7 @@ nsDocShell::Destroy() {
|
|||
// We want to destroy these content viewers now rather than
|
||||
// letting their destruction wait for the session history
|
||||
// entries to get garbage collected. (Bug 488394)
|
||||
GetSessionHistory()->EvictLocalContentViewers();
|
||||
GetSessionHistory()->EvictLocalDocumentViewers();
|
||||
}
|
||||
|
||||
if (mWillChangeProcess && !mBrowsingContext->IsDiscarded()) {
|
||||
|
|
|
@ -235,7 +235,7 @@ void ChildSHistory::RemovePendingHistoryNavigations() {
|
|||
mPendingNavigations.clear();
|
||||
}
|
||||
|
||||
void ChildSHistory::EvictLocalContentViewers() {
|
||||
void ChildSHistory::EvictLocalDocumentViewers() {
|
||||
if (!mozilla::SessionHistoryInParent()) {
|
||||
mHistory->EvictAllDocumentViewers();
|
||||
}
|
||||
|
|
|
@ -80,7 +80,7 @@ class ChildSHistory : public nsISupports, public nsWrapperCache {
|
|||
/**
|
||||
* Evicts all content viewers within the current process.
|
||||
*/
|
||||
void EvictLocalContentViewers();
|
||||
void EvictLocalDocumentViewers();
|
||||
|
||||
// GetLegacySHistory and LegacySHistory have been deprecated. Don't
|
||||
// use these, but instead handle the interaction with nsISHistory in
|
||||
|
|
|
@ -1794,10 +1794,10 @@ nsresult nsFrameLoader::SwapWithOtherLoader(nsFrameLoader* aOther,
|
|||
|
||||
// Drop any cached content viewers in the two session histories.
|
||||
if (ourHistory) {
|
||||
ourHistory->EvictLocalContentViewers();
|
||||
ourHistory->EvictLocalDocumentViewers();
|
||||
}
|
||||
if (otherHistory) {
|
||||
otherHistory->EvictLocalContentViewers();
|
||||
otherHistory->EvictLocalDocumentViewers();
|
||||
}
|
||||
|
||||
NS_ASSERTION(ourFrame == ourContent->GetPrimaryFrame() &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче