Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set up preference style rules before any frame creation happens. b=148414 r=bryner sr=waterson

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2002-06-25 21:21:48 +00:00
parent e63a11c0e8
commit ff0f07e45b
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsPresShell.cpp
View File

@ -1715,6 +1715,10 @@ PresShell::Init(nsIDocument* aDocument,
// style set, but before creating any frames.
mPresContext->SetCompatibilityMode(aCompatMode);
// setup the preference style rules (no forced reflow), and do it
// before creating any frames.
SetPreferenceStyleRules(PR_FALSE);
mHistoryState = nsnull;
nsresult result = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull,
@ -1796,8 +1800,6 @@ PresShell::Init(nsIDocument* aDocument,
#ifdef IBMBIDI
mBidiKeyboard = do_GetService("@mozilla.org/widget/bidikeyboard;1");
#endif
// setup the preference style rules up (no forced reflow)
SetPreferenceStyleRules(PR_FALSE);
#ifdef MOZ_REFLOW_PERF
// Get the prefs service
@ -2251,6 +2253,7 @@ PresShell::SetPreferenceStyleRules(PRBool aForceReflow)
// this is harsh, but without it the new colors don't appear on the current page
// Fortunately, it only happens when the prefs change, a rare event.
// XXX - determine why the normal PresContext::RemapStyleAndReflow doesn't cut it
// XXXldb FIX THIS!
ReconstructFrames();
}
@ -6425,6 +6428,9 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
else {
// The reflow command couldn't be added to the tree; leave
// it in the queue, and we'll handle it next time.
#ifdef DEBUG
printf("WARNING: Couldn't add reflow command, so splitting.\n");
#endif
}
}

10
layout/html/base/src/nsPresShell.cpp
View File

@ -1715,6 +1715,10 @@ PresShell::Init(nsIDocument* aDocument,
// style set, but before creating any frames.
mPresContext->SetCompatibilityMode(aCompatMode);
// setup the preference style rules (no forced reflow), and do it
// before creating any frames.
SetPreferenceStyleRules(PR_FALSE);
mHistoryState = nsnull;
nsresult result = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull,
@ -1796,8 +1800,6 @@ PresShell::Init(nsIDocument* aDocument,
#ifdef IBMBIDI
mBidiKeyboard = do_GetService("@mozilla.org/widget/bidikeyboard;1");
#endif
// setup the preference style rules up (no forced reflow)
SetPreferenceStyleRules(PR_FALSE);
#ifdef MOZ_REFLOW_PERF
// Get the prefs service
@ -2251,6 +2253,7 @@ PresShell::SetPreferenceStyleRules(PRBool aForceReflow)
// this is harsh, but without it the new colors don't appear on the current page
// Fortunately, it only happens when the prefs change, a rare event.
// XXX - determine why the normal PresContext::RemapStyleAndReflow doesn't cut it
// XXXldb FIX THIS!
ReconstructFrames();
}
@ -6425,6 +6428,9 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
else {
// The reflow command couldn't be added to the tree; leave
// it in the queue, and we'll handle it next time.
#ifdef DEBUG
printf("WARNING: Couldn't add reflow command, so splitting.\n");
#endif
}
}