corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1662840: Move overrideDPPX from nsIContentViewer to BrowsingContext. r=whimboo,remote-protocol-reviewers,mtigley,emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D104001
This commit is contained in:
Kris Maglione
2021-02-10 01:30:35 +00:00
parent 78b683f3e8
commit 57467158f0
17 changed files with 85 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docshell/base/nsDocShell.cpp
View File

@@ -7373,14 +7373,6 @@ nsresult nsDocShell::RestoreFromHistory() {
mSavingOldViewer = CanSavePresentation(mLoadType, request, doc);
}
nsCOMPtr<nsIContentViewer> oldCv(mContentViewer);
nsCOMPtr<nsIContentViewer> newCv(viewer);
float overrideDPPX = 0.0f;
if (oldCv) {
oldCv->GetOverrideDPPX(&overrideDPPX);
}
// Protect against mLSHE going away via a load triggered from
// pagehide or unload.
nsCOMPtr<nsISHEntry> origLSHE = mLSHE;
@@ -7603,10 +7595,6 @@ nsresult nsDocShell::RestoreFromHistory() {
FavorPerformanceHint(true);
}
if (oldCv) {
newCv->SetOverrideDPPX(overrideDPPX);
}
if (document) {
RefPtr<nsDocShell> parent = GetInProcessParentDocshell();
if (parent) {
@@ -8173,7 +8161,6 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
const Encoding* hintCharset = nullptr;
int32_t hintCharsetSource = kCharsetUninitialized;
float overrideDPPX = 1.0;
// |newMUDV| also serves as a flag to set the data from the above vars
nsCOMPtr<nsIContentViewer> newCv;
@@ -8205,8 +8192,6 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
hintCharset = oldCv->GetHintCharset();
NS_ENSURE_SUCCESS(oldCv->GetHintCharacterSetSource(&hintCharsetSource),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(oldCv->GetOverrideDPPX(&overrideDPPX),
NS_ERROR_FAILURE);
}
}
}
@@ -8263,9 +8248,10 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
newCv->SetHintCharset(hintCharset);
NS_ENSURE_SUCCESS(newCv->SetHintCharacterSetSource(hintCharsetSource),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(newCv->SetOverrideDPPX(overrideDPPX), NS_ERROR_FAILURE);
}
NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE);
// Stuff the bgcolor from the old pres shell into the new
// pres shell. This improves page load continuity.
if (RefPtr<PresShell> presShell = mContentViewer->GetPresShell()) {