Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out these changes since they appear to have caused a Txul regression on some tinderboxes (not all... weird...)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@135111 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
caillon%returnzero.com
2002-12-11 05:11:02 +00:00
parent cd7937182e
commit d751688cb9
30 changed files with 374 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -93,8 +93,7 @@
#include "nsIAnonymousContentCreator.h"
#include "nsIFrameManager.h"
#include "nsIAttributeContent.h"
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "nsIPref.h"
#include "nsLegendFrame.h"
#include "nsIContentIterator.h"
#include "nsBoxLayoutState.h"
@@ -4232,10 +4231,10 @@ nsCSSFrameConstructor::HasGfxScrollbars()
#endif
// Get the Prefs
if (!mGotGfxPrefs) {
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
nsCOMPtr<nsIPref> pref(do_GetService(NS_PREF_CONTRACTID));
if (pref) {
PRBool hasGfxScroll = PR_FALSE; // use a temp since we have a PRPackedBool
prefBranch->GetBoolPref("nglayout.widget.gfxscrollbars", &hasGfxScroll);
pref->GetBoolPref("nglayout.widget.gfxscrollbars", &hasGfxScroll);
mHasGfxScrollbars = hasGfxScroll;
mGotGfxPrefs = PR_TRUE;
} else {
@@ -4252,10 +4251,10 @@ PRBool
nsCSSFrameConstructor::UseXBLForms()
{
if (!mGotXBLFormPrefs) {
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
nsCOMPtr<nsIPref> pref(do_GetService(NS_PREF_CONTRACTID));
if (pref) {
PRBool useXBLForms = PR_FALSE; // use a temp since we have a PRPackedBool
prefBranch->GetBoolPref("nglayout.debug.enable_xbl_forms", &useXBLForms);
pref->GetBoolPref("nglayout.debug.enable_xbl_forms", &useXBLForms);
mUseXBLForms = useXBLForms;
mGotXBLFormPrefs = PR_TRUE;
}