Backed out changeset 6849ce51dfef (patch 3 from bug 468645) to fix bug 472353.

This commit is contained in:
L. David Baron 2009-01-20 13:45:23 -08:00
Родитель e9a0d8f6f8
Коммит 3ee79641c3
2 изменённых файлов: 0 добавлений и 14 удалений

Просмотреть файл

@ -13398,13 +13398,6 @@ nsCSSFrameConstructor::RebuildAllStyleData(nsChangeHint aExtraHint)
if (!mPresShell || !mPresShell->GetRootFrame())
return;
if (mPresShell->GetPresContext()->IsPaginated()) {
// We don't support doing this because of bug 470929 and probably
// other issues.
NS_NOTREACHED("not allowed to rebuild all style data when paginated");
return;
}
// Processing the style changes could cause a flush that propagates to
// the parent frame and thus destroys the pres shell.
nsCOMPtr<nsIPresShell> kungFuDeathGrip(mPresShell);

Просмотреть файл

@ -733,13 +733,6 @@ nsPresContext::GetUserPreferences()
void
nsPresContext::PreferenceChanged(const char* aPrefName)
{
if (IsPaginated()) {
// Until we fix things so that we can do multiple reflows and style
// rebuilds (see, e.g., bug 470929) in paginated mode, we should
// ignore preference changes when paginated.
return;
}
nsDependentCString prefName(aPrefName);
if (prefName.EqualsLiteral("layout.css.dpi")) {
PRInt32 oldAppUnitsPerDevPixel = AppUnitsPerDevPixel();