From 3ee79641c3898556eb26d3894a3a41b2c0196bf5 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Tue, 20 Jan 2009 13:45:23 -0800 Subject: [PATCH] Backed out changeset 6849ce51dfef (patch 3 from bug 468645) to fix bug 472353. --- layout/base/nsCSSFrameConstructor.cpp | 7 ------- layout/base/nsPresContext.cpp | 7 ------- 2 files changed, 14 deletions(-) diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index cea999ac745e..9daeab1ada64 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -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 kungFuDeathGrip(mPresShell); diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 09b536d120e1..8e9df33cd85d 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -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();