Ensure that text zoom persisted from a previous page is applied to frames. Patch from Tom Mraz <t8m@centrum.cz>. r=dbaron sr=jag a=scc
git-svn-id: svn://10.0.0.236/trunk@117574 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1931,6 +1931,7 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
|
||||
// Do some docShell Specific stuff.
|
||||
nsXPIDLString defaultCharset;
|
||||
nsXPIDLString forceCharset;
|
||||
float textZoom = 1.0;
|
||||
NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsIMarkupDocumentViewer> muDV =
|
||||
@@ -1942,6 +1943,9 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
|
||||
NS_ENSURE_SUCCESS(muDV->
|
||||
GetForceCharacterSet(getter_Copies(forceCharset)),
|
||||
NS_ERROR_FAILURE);
|
||||
NS_ENSURE_SUCCESS(muDV->
|
||||
GetTextZoom(&textZoom),
|
||||
NS_ERROR_FAILURE);
|
||||
}
|
||||
nsCOMPtr<nsIContentViewer> childCV;
|
||||
NS_ENSURE_SUCCESS(childAsDocShell->
|
||||
@@ -1955,6 +1959,8 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
|
||||
NS_ERROR_FAILURE);
|
||||
NS_ENSURE_SUCCESS(childmuDV->SetForceCharacterSet(forceCharset),
|
||||
NS_ERROR_FAILURE);
|
||||
NS_ENSURE_SUCCESS(childmuDV->SetTextZoom(textZoom),
|
||||
NS_ERROR_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user