Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge backout of changeset 6849ce51dfef (patch 3 from bug 468645) to fix bug 472353.

Browse Source
This commit is contained in:
L. David Baron 2009-01-20 13:54:17 -08:00
commit 45688b5695
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/base/nsCSSFrameConstructor.cpp
View File

@ -12609,13 +12609,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;
}
nsAutoScriptBlocker scriptBlocker;
// Make sure that the viewmanager will outlive the presshell

7
layout/base/nsPresContext.cpp
View File

@ -736,13 +736,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();