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

Bug 390180: Full page zoom interacts badly with bfcache. r+sr+a=roc

Browse Source
This commit is contained in:
2007-08-27 18:20:17 -07:00
parent 251ab13ada
commit c4471aec31
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
docshell/base/nsDocShell.cpp
View File

@@ -5433,9 +5433,12 @@ nsDocShell::RestoreFromHistory()
nsCOMPtr<nsIMarkupDocumentViewer> oldMUDV(do_QueryInterface(mContentViewer));
nsCOMPtr<nsIMarkupDocumentViewer> newMUDV(do_QueryInterface(viewer));
float zoom = 1.0;
if (oldMUDV && newMUDV)
oldMUDV->GetTextZoom(&zoom);
float textZoom = 1.0f;
float pageZoom = 1.0f;
if (oldMUDV && newMUDV) {
oldMUDV->GetTextZoom(&textZoom);
oldMUDV->GetFullZoom(&pageZoom);
}
// Protect against mLSHE going away via a load triggered from
// pagehide or unload.
@@ -5614,8 +5617,10 @@ nsDocShell::RestoreFromHistory()
FavorPerformanceHint(PR_TRUE, NS_EVENT_STARVATION_DELAY_HINT);
if (oldMUDV && newMUDV)
newMUDV->SetTextZoom(zoom);
if (oldMUDV && newMUDV) {
newMUDV->SetTextZoom(textZoom);
newMUDV->SetFullZoom(pageZoom);
}
nsCOMPtr<nsIDocument> document = do_QueryInterface(domDoc);
if (document) {
@@ -5947,6 +5952,7 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
PRInt32 hintCharsetSource;
nsCAutoString prevDocCharset;
float textZoom;
float pageZoom;
PRBool styleDisabled;
// |newMUDV| also serves as a flag to set the data from the above vars
nsCOMPtr<nsIMarkupDocumentViewer> newMUDV;
@@ -5996,6 +6002,9 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
NS_ENSURE_SUCCESS(oldMUDV->
GetTextZoom(&textZoom),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(oldMUDV->
GetFullZoom(&pageZoom),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(oldMUDV->
GetAuthorStyleDisabled(&styleDisabled),
NS_ERROR_FAILURE);
@@ -6130,6 +6139,8 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(newMUDV->SetTextZoom(textZoom),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(newMUDV->SetFullZoom(pageZoom),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(newMUDV->SetAuthorStyleDisabled(styleDisabled),
NS_ERROR_FAILURE);
}