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

made compatibility mode pref an override of auto

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@38538 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl%netscape.com 1999-07-07 01:21:25 +00:00
parent bd6b8b2517
commit 2214ff6e4d
3 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/layout/base/nsPresContext.cpp
View File

@ -67,7 +67,8 @@ nsPresContext::nsPresContext()
{
NS_INIT_REFCNT();
nsLayoutAtoms::AddrefAtoms();
mCompatibilityMode = eCompatibility_NavQuirks;
mCompatibilityMode = eCompatibility_Standard;
mCompatibilityLocked = PR_FALSE;
mWidgetRenderingMode = eWidgetRendering_Native; // to be changed to _Gfx soon!
#ifdef _WIN32
@ -184,7 +185,23 @@ nsPresContext::GetUserPreferences()
}
if (NS_OK == mPrefs->GetIntPref("nglayout.compatibility.mode", &prefInt)) {
mCompatibilityMode = (enum nsCompatibility)prefInt; // bad cast
switch (prefInt) {
case 1:
mCompatibilityLocked = PR_TRUE;
mCompatibilityMode = eCompatibility_Standard;
break;
case 2:
mCompatibilityLocked = PR_TRUE;
mCompatibilityMode = eCompatibility_NavQuirks;
break;
case 0: // auto
default:
mCompatibilityLocked = PR_FALSE;
break;
}
}
else {
mCompatibilityLocked = PR_FALSE; // auto
}
if (NS_OK == mPrefs->GetIntPref("nglayout.widget.mode", &prefInt)) {
@ -316,7 +333,9 @@ nsPresContext::GetCompatibilityMode(nsCompatibility* aResult)
NS_IMETHODIMP
nsPresContext::SetCompatibilityMode(nsCompatibility aMode)
{
mCompatibilityMode = aMode;
if (! mCompatibilityLocked) {
mCompatibilityMode = aMode;
}
return NS_OK;
}

25
mozilla/layout/base/src/nsPresContext.cpp
View File

@ -67,7 +67,8 @@ nsPresContext::nsPresContext()
{
NS_INIT_REFCNT();
nsLayoutAtoms::AddrefAtoms();
mCompatibilityMode = eCompatibility_NavQuirks;
mCompatibilityMode = eCompatibility_Standard;
mCompatibilityLocked = PR_FALSE;
mWidgetRenderingMode = eWidgetRendering_Native; // to be changed to _Gfx soon!
#ifdef _WIN32
@ -184,7 +185,23 @@ nsPresContext::GetUserPreferences()
}
if (NS_OK == mPrefs->GetIntPref("nglayout.compatibility.mode", &prefInt)) {
mCompatibilityMode = (enum nsCompatibility)prefInt; // bad cast
switch (prefInt) {
case 1:
mCompatibilityLocked = PR_TRUE;
mCompatibilityMode = eCompatibility_Standard;
break;
case 2:
mCompatibilityLocked = PR_TRUE;
mCompatibilityMode = eCompatibility_NavQuirks;
break;
case 0: // auto
default:
mCompatibilityLocked = PR_FALSE;
break;
}
}
else {
mCompatibilityLocked = PR_FALSE; // auto
}
if (NS_OK == mPrefs->GetIntPref("nglayout.widget.mode", &prefInt)) {
@ -316,7 +333,9 @@ nsPresContext::GetCompatibilityMode(nsCompatibility* aResult)
NS_IMETHODIMP
nsPresContext::SetCompatibilityMode(nsCompatibility aMode)
{
mCompatibilityMode = aMode;
if (! mCompatibilityLocked) {
mCompatibilityMode = aMode;
}
return NS_OK;
}

1
mozilla/layout/base/src/nsPresContext.h
View File

@ -142,6 +142,7 @@ protected:
nsVoidArray mImageLoaders;
nsCOMPtr<nsIEventStateManager> mEventManager;
nsCompatibility mCompatibilityMode;
PRBool mCompatibilityLocked;
nsWidgetRendering mWidgetRenderingMode;
nsCOMPtr<nsIURI> mBaseURL;
PRBool mStopped;