зеркало из https://github.com/mozilla/pjs.git
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
This commit is contained in:
Родитель
4cc9aa62ef
Коммит
a029736ff6
|
@ -1931,6 +1931,7 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
|
||||||
// Do some docShell Specific stuff.
|
// Do some docShell Specific stuff.
|
||||||
nsXPIDLString defaultCharset;
|
nsXPIDLString defaultCharset;
|
||||||
nsXPIDLString forceCharset;
|
nsXPIDLString forceCharset;
|
||||||
|
float textZoom = 1.0;
|
||||||
NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE);
|
||||||
|
|
||||||
nsCOMPtr<nsIMarkupDocumentViewer> muDV =
|
nsCOMPtr<nsIMarkupDocumentViewer> muDV =
|
||||||
|
@ -1942,6 +1943,9 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
|
||||||
NS_ENSURE_SUCCESS(muDV->
|
NS_ENSURE_SUCCESS(muDV->
|
||||||
GetForceCharacterSet(getter_Copies(forceCharset)),
|
GetForceCharacterSet(getter_Copies(forceCharset)),
|
||||||
NS_ERROR_FAILURE);
|
NS_ERROR_FAILURE);
|
||||||
|
NS_ENSURE_SUCCESS(muDV->
|
||||||
|
GetTextZoom(&textZoom),
|
||||||
|
NS_ERROR_FAILURE);
|
||||||
}
|
}
|
||||||
nsCOMPtr<nsIContentViewer> childCV;
|
nsCOMPtr<nsIContentViewer> childCV;
|
||||||
NS_ENSURE_SUCCESS(childAsDocShell->
|
NS_ENSURE_SUCCESS(childAsDocShell->
|
||||||
|
@ -1955,6 +1959,8 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
|
||||||
NS_ERROR_FAILURE);
|
NS_ERROR_FAILURE);
|
||||||
NS_ENSURE_SUCCESS(childmuDV->SetForceCharacterSet(forceCharset),
|
NS_ENSURE_SUCCESS(childmuDV->SetForceCharacterSet(forceCharset),
|
||||||
NS_ERROR_FAILURE);
|
NS_ERROR_FAILURE);
|
||||||
|
NS_ENSURE_SUCCESS(childmuDV->SetTextZoom(textZoom),
|
||||||
|
NS_ERROR_FAILURE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче