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

Ensure that the quirks stylesheet is enabled/disabled before we start creating frames so that we don't have to build the rule cascade twice. Remove old compatibility mode pref that only controlled a small part of what it should have. b=141261 sr=waterson r=jst

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2002-05-23 23:09:31 +00:00
parent 7879286cfb
commit 8d231a5fae
15 changed files with 112 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/base/src/nsDocumentViewer.cpp
View File

@ -1824,6 +1824,7 @@ DocumentViewerImpl::SetDOMDocument(nsIDOMDocument *aDocument)
NS_IMETHODIMP
DocumentViewerImpl::SetUAStyleSheet(nsIStyleSheet* aUAStyleSheet)
{
NS_ASSERTION(aUAStyleSheet, "unexpected null pointer");
if (aUAStyleSheet) {
nsCOMPtr<nsICSSStyleSheet> sheet(do_QueryInterface(aUAStyleSheet));
nsCOMPtr<nsICSSStyleSheet> newSheet;
@ -3838,14 +3839,15 @@ DocumentViewerImpl::ReflowPrintObject(PrintObject * aPO, PRBool aDoCalcShrink)
}
#endif // NS_PRINT_PREVIEW
nsCompatibility mode;
mPresContext->GetCompatibilityMode(&mode);
// Setup hierarchical relationship in view manager
aPO->mViewManager->SetRootView(aPO->mRootView);
aPO->mPresShell->Init(document, aPO->mPresContext,
aPO->mViewManager, aPO->mStyleSet);
aPO->mViewManager, aPO->mStyleSet,
mode != eCompatibility_Standard);
nsCompatibility mode;
mPresContext->GetCompatibilityMode(&mode);
aPO->mPresContext->SetCompatibilityMode(mode);
if (!containerIsSet) {
nsCOMPtr<nsISupports> supps(do_QueryInterface(aPO->mWebShell));
aPO->mPresContext->SetContainer(supps);

14
content/base/src/nsStyleSet.cpp
View File

@ -864,9 +864,23 @@ NS_IMETHODIMP StyleSetImpl::EnableQuirkStyleSheet(PRBool aEnable)
}
}
}
NS_ASSERTION(mQuirkStyleSheet, "no quirk stylesheet");
if (mQuirkStyleSheet) {
#if defined(DEBUG_warren) || defined(DEBUG_attinasi)
printf( "%s Quirk StyleSheet\n", aEnable ? "Enabling" : "Disabling" );
#endif
#ifdef DEBUG
PRUint32 count = 0;
if (mAgentRuleProcessors)
mAgentRuleProcessors->Count(&count);
PRBool enabledNow;
mQuirkStyleSheet->GetEnabled(enabledNow);
NS_ASSERTION(count == 0 || aEnable == enabledNow,
"enabling/disabling quirk stylesheet too late");
#ifdef DEBUG_dbaron
if (count != 0 && aEnable == enabledNow)
printf("WARNING: We set the quirks mode too many times.\n"); // we do!
#endif
#endif
mQuirkStyleSheet->SetEnabled(aEnable);
}

13
content/html/document/src/nsHTMLDocument.cpp
View File

@ -495,17 +495,8 @@ nsHTMLDocument::CreateShell(nsIPresContext* aContext,
nsIStyleSet* aStyleSet,
nsIPresShell** aInstancePtrResult)
{
nsresult result = nsMarkupDocument::CreateShell(aContext,
aViewManager,
aStyleSet,
aInstancePtrResult);
if (NS_SUCCEEDED(result)) {
aContext->SetCompatibilityMode(((eDTDMode_strict== mDTDMode) ?
eCompatibility_Standard :
eCompatibility_NavQuirks));
}
return result;
return doCreateShell(aContext, aViewManager, aStyleSet,
eDTDMode_strict != mDTDMode, aInstancePtrResult);
}
// The following Try*Charset will return PR_FALSE only if the charset source

24
content/html/document/src/nsMarkupDocument.cpp
View File

@ -61,11 +61,22 @@ nsMarkupDocument::CreateShell(nsIPresContext* aContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet,
nsIPresShell** aInstancePtrResult)
{
// Don't add anything here. Add it to |doCreateShell| instead. This
// exists so nsHTMLDocument can pass PR_TRUE for the 4th parameter
// some of the time.
return doCreateShell(aContext, aViewManager, aStyleSet, PR_FALSE,
aInstancePtrResult);
}
nsresult
nsMarkupDocument::doCreateShell(nsIPresContext* aContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode,
nsIPresShell** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {
return NS_ERROR_NULL_POINTER;
}
nsresult rv;
nsCOMPtr<nsIPresShell> shell(do_CreateInstance(kPresShellCID,&rv));
@ -73,7 +84,7 @@ nsMarkupDocument::CreateShell(nsIPresContext* aContext,
return rv;
}
rv = shell->Init(this, aContext, aViewManager, aStyleSet);
rv = shell->Init(this, aContext, aViewManager, aStyleSet, aIsQuirksMode);
if (NS_FAILED(rv)) {
return rv;
}
@ -83,11 +94,6 @@ nsMarkupDocument::CreateShell(nsIPresContext* aContext,
*aInstancePtrResult = shell.get();
NS_ADDREF(*aInstancePtrResult);
// tell the context the mode we want (always standard, which
// should be correct for everything except HTML)
// nsHTMLDocument overrides this method and sets it differently
aContext->SetCompatibilityMode(eCompatibility_Standard);
return NS_OK;
}

9
content/html/document/src/nsMarkupDocument.h
View File

@ -62,6 +62,15 @@ public:
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet,
nsIPresShell** aInstancePtrResult);
protected:
// To allow different implementations to choose the quirks mode
// differently for their |CreateShell| without overriding the whole
// thing.
nsresult doCreateShell(nsIPresContext* aContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode,
nsIPresShell** aInstancePtrResult);
};
#endif /* nsMarkupDocument_h___ */

16
content/xul/document/src/nsXULDocument.cpp
View File

@ -1053,19 +1053,14 @@ nsXULDocument::CreateShell(nsIPresContext* aContext,
nsIPresShell** aInstancePtrResult)
{
NS_PRECONDITION(aInstancePtrResult, "null ptr");
if (! aInstancePtrResult)
return NS_ERROR_NULL_POINTER;
nsresult rv;
nsIPresShell* shell;
if (NS_FAILED(rv = nsComponentManager::CreateInstance(kPresShellCID,
nsnull,
NS_GET_IID(nsIPresShell),
(void**) &shell)))
nsresult rv = CallCreateInstance(kPresShellCID, &shell);
if (NS_FAILED(rv))
return rv;
if (NS_FAILED(rv = shell->Init(this, aContext, aViewManager, aStyleSet))) {
rv = shell->Init(this, aContext, aViewManager, aStyleSet, PR_FALSE);
if (NS_FAILED(rv)) {
NS_RELEASE(shell);
return rv;
}
@ -1073,9 +1068,6 @@ nsXULDocument::CreateShell(nsIPresContext* aContext,
mPresShells.AppendElement(shell);
*aInstancePtrResult = shell; // addref implicit in CreateInstance()
// tell the context the mode we want (always standard)
aContext->SetCompatibilityMode(eCompatibility_Standard);
return NS_OK;
}

10
layout/base/nsDocumentViewer.cpp
View File

@ -1824,6 +1824,7 @@ DocumentViewerImpl::SetDOMDocument(nsIDOMDocument *aDocument)
NS_IMETHODIMP
DocumentViewerImpl::SetUAStyleSheet(nsIStyleSheet* aUAStyleSheet)
{
NS_ASSERTION(aUAStyleSheet, "unexpected null pointer");
if (aUAStyleSheet) {
nsCOMPtr<nsICSSStyleSheet> sheet(do_QueryInterface(aUAStyleSheet));
nsCOMPtr<nsICSSStyleSheet> newSheet;
@ -3838,14 +3839,15 @@ DocumentViewerImpl::ReflowPrintObject(PrintObject * aPO, PRBool aDoCalcShrink)
}
#endif // NS_PRINT_PREVIEW
nsCompatibility mode;
mPresContext->GetCompatibilityMode(&mode);
// Setup hierarchical relationship in view manager
aPO->mViewManager->SetRootView(aPO->mRootView);
aPO->mPresShell->Init(document, aPO->mPresContext,
aPO->mViewManager, aPO->mStyleSet);
aPO->mViewManager, aPO->mStyleSet,
mode != eCompatibility_Standard);
nsCompatibility mode;
mPresContext->GetCompatibilityMode(&mode);
aPO->mPresContext->SetCompatibilityMode(mode);
if (!containerIsSet) {
nsCOMPtr<nsISupports> supps(do_QueryInterface(aPO->mWebShell));
aPO->mPresContext->SetContainer(supps);

3
layout/base/nsIPresShell.h
View File

@ -125,7 +125,8 @@ public:
NS_IMETHOD Init(nsIDocument* aDocument,
nsIPresContext* aPresContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet) = 0;
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode) = 0;
/**
* All callers are responsible for calling |Destroy| after calling

41
layout/base/nsPresContext.cpp
View File

@ -150,7 +150,6 @@ nsPresContext::nsPresContext()
{
NS_INIT_REFCNT();
mCompatibilityMode = eCompatibility_Standard;
mCompatibilityLocked = PR_FALSE;
mWidgetRenderingMode = eWidgetRendering_Gfx;
mImageAnimationMode = imgIContainer::kNormalAnimMode;
mImageAnimationModePref = imgIContainer::kNormalAnimMode;
@ -454,27 +453,6 @@ nsPresContext::GetUserPreferences()
mFontScaler = prefInt;
}
if (NS_SUCCEEDED(mPrefs->GetIntPref("nglayout.compatibility.mode", &prefInt))) {
// XXX this should really be a state on the webshell instead of using prefs
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_SUCCEEDED(mPrefs->GetIntPref("nglayout.widget.mode", &prefInt))) {
mWidgetRenderingMode = (enum nsWidgetRendering)prefInt; // bad cast
}
@ -783,18 +761,15 @@ nsPresContext::GetCompatibilityMode(nsCompatibility* aResult)
NS_IMETHODIMP
nsPresContext::SetCompatibilityMode(nsCompatibility aMode)
{
if (! mCompatibilityLocked) {
mCompatibilityMode = aMode;
}
mCompatibilityMode = aMode;
NS_ENSURE_TRUE(mShell, NS_OK);
// enable/disable the QuirkSheet
NS_ASSERTION(mShell, "PresShell must be set on PresContext before calling nsPresContext::SetCompatibilityMode");
if (mShell) {
nsCOMPtr<nsIStyleSet> set;
nsresult rv = mShell->GetStyleSet(getter_AddRefs(set));
if (NS_SUCCEEDED(rv) && set) {
set->EnableQuirkStyleSheet((mCompatibilityMode != eCompatibility_Standard) ? PR_TRUE : PR_FALSE);
}
nsCOMPtr<nsIStyleSet> set;
mShell->GetStyleSet(getter_AddRefs(set));
if (set) {
set->EnableQuirkStyleSheet(mCompatibilityMode != eCompatibility_Standard);
}
return NS_OK;
}
@ -1477,6 +1452,8 @@ nsPresContext::LoadImage(const nsString& aURL,
rv = content->GetDocument(*getter_AddRefs(document));
// If there is no document, skip the policy check
// XXXldb This really means the document is being destroyed, so
// perhaps we're better off skipping the load entirely.
if (document) {
nsCOMPtr<nsIScriptGlobalObject> globalScript;
rv = document->GetScriptGlobalObject(getter_AddRefs(globalScript));

13
layout/base/nsPresShell.cpp
View File

@ -1057,7 +1057,8 @@ public:
NS_IMETHOD Init(nsIDocument* aDocument,
nsIPresContext* aPresContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet);
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode);
NS_IMETHOD Destroy();
NS_IMETHOD AllocateFrame(size_t aSize, void** aResult);
@ -1678,7 +1679,8 @@ NS_IMETHODIMP
PresShell::Init(nsIDocument* aDocument,
nsIPresContext* aPresContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet)
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode)
{
NS_PRECONDITION(nsnull != aDocument, "null ptr");
NS_PRECONDITION(nsnull != aPresContext, "null ptr");
@ -1699,11 +1701,16 @@ PresShell::Init(nsIDocument* aDocument,
mViewManager->SetViewObserver(this);
// Bind the context to the presentation shell.
mPresContext = dont_QueryInterface(aPresContext);
mPresContext = aPresContext;
aPresContext->SetShell(this);
mStyleSet = aStyleSet;
// Set the compatibility mode after attaching the pres context and
// style set, but before creating any frames.
mPresContext->SetCompatibilityMode(aIsQuirksMode
? eCompatibility_NavQuirks : eCompatibility_Standard);
mHistoryState = nsnull;
nsresult result = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull,

3
layout/base/public/nsIPresShell.h
View File

@ -125,7 +125,8 @@ public:
NS_IMETHOD Init(nsIDocument* aDocument,
nsIPresContext* aPresContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet) = 0;
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode) = 0;
/**
* All callers are responsible for calling |Destroy| after calling

41
layout/base/src/nsPresContext.cpp
View File

@ -150,7 +150,6 @@ nsPresContext::nsPresContext()
{
NS_INIT_REFCNT();
mCompatibilityMode = eCompatibility_Standard;
mCompatibilityLocked = PR_FALSE;
mWidgetRenderingMode = eWidgetRendering_Gfx;
mImageAnimationMode = imgIContainer::kNormalAnimMode;
mImageAnimationModePref = imgIContainer::kNormalAnimMode;
@ -454,27 +453,6 @@ nsPresContext::GetUserPreferences()
mFontScaler = prefInt;
}
if (NS_SUCCEEDED(mPrefs->GetIntPref("nglayout.compatibility.mode", &prefInt))) {
// XXX this should really be a state on the webshell instead of using prefs
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_SUCCEEDED(mPrefs->GetIntPref("nglayout.widget.mode", &prefInt))) {
mWidgetRenderingMode = (enum nsWidgetRendering)prefInt; // bad cast
}
@ -783,18 +761,15 @@ nsPresContext::GetCompatibilityMode(nsCompatibility* aResult)
NS_IMETHODIMP
nsPresContext::SetCompatibilityMode(nsCompatibility aMode)
{
if (! mCompatibilityLocked) {
mCompatibilityMode = aMode;
}
mCompatibilityMode = aMode;
NS_ENSURE_TRUE(mShell, NS_OK);
// enable/disable the QuirkSheet
NS_ASSERTION(mShell, "PresShell must be set on PresContext before calling nsPresContext::SetCompatibilityMode");
if (mShell) {
nsCOMPtr<nsIStyleSet> set;
nsresult rv = mShell->GetStyleSet(getter_AddRefs(set));
if (NS_SUCCEEDED(rv) && set) {
set->EnableQuirkStyleSheet((mCompatibilityMode != eCompatibility_Standard) ? PR_TRUE : PR_FALSE);
}
nsCOMPtr<nsIStyleSet> set;
mShell->GetStyleSet(getter_AddRefs(set));
if (set) {
set->EnableQuirkStyleSheet(mCompatibilityMode != eCompatibility_Standard);
}
return NS_OK;
}
@ -1477,6 +1452,8 @@ nsPresContext::LoadImage(const nsString& aURL,
rv = content->GetDocument(*getter_AddRefs(document));
// If there is no document, skip the policy check
// XXXldb This really means the document is being destroyed, so
// perhaps we're better off skipping the load entirely.
if (document) {
nsCOMPtr<nsIScriptGlobalObject> globalScript;
rv = document->GetScriptGlobalObject(getter_AddRefs(globalScript));

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

@ -262,7 +262,6 @@ protected:
nsCOMPtr<nsIURI> mBaseURL;
nsCompatibility mCompatibilityMode;
PRPackedBool mCompatibilityLocked;
nsWidgetRendering mWidgetRenderingMode;
PRPackedBool mImageAnimationStopped; // image animation stopped

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

@ -1057,7 +1057,8 @@ public:
NS_IMETHOD Init(nsIDocument* aDocument,
nsIPresContext* aPresContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet);
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode);
NS_IMETHOD Destroy();
NS_IMETHOD AllocateFrame(size_t aSize, void** aResult);
@ -1678,7 +1679,8 @@ NS_IMETHODIMP
PresShell::Init(nsIDocument* aDocument,
nsIPresContext* aPresContext,
nsIViewManager* aViewManager,
nsIStyleSet* aStyleSet)
nsIStyleSet* aStyleSet,
PRBool aIsQuirksMode)
{
NS_PRECONDITION(nsnull != aDocument, "null ptr");
NS_PRECONDITION(nsnull != aPresContext, "null ptr");
@ -1699,11 +1701,16 @@ PresShell::Init(nsIDocument* aDocument,
mViewManager->SetViewObserver(this);
// Bind the context to the presentation shell.
mPresContext = dont_QueryInterface(aPresContext);
mPresContext = aPresContext;
aPresContext->SetShell(this);
mStyleSet = aStyleSet;
// Set the compatibility mode after attaching the pres context and
// style set, but before creating any frames.
mPresContext->SetCompatibilityMode(aIsQuirksMode
? eCompatibility_NavQuirks : eCompatibility_Standard);
mHistoryState = nsnull;
nsresult result = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull,

14
layout/style/nsStyleSet.cpp
View File

@ -864,9 +864,23 @@ NS_IMETHODIMP StyleSetImpl::EnableQuirkStyleSheet(PRBool aEnable)
}
}
}
NS_ASSERTION(mQuirkStyleSheet, "no quirk stylesheet");
if (mQuirkStyleSheet) {
#if defined(DEBUG_warren) || defined(DEBUG_attinasi)
printf( "%s Quirk StyleSheet\n", aEnable ? "Enabling" : "Disabling" );
#endif
#ifdef DEBUG
PRUint32 count = 0;
if (mAgentRuleProcessors)
mAgentRuleProcessors->Count(&count);
PRBool enabledNow;
mQuirkStyleSheet->GetEnabled(enabledNow);
NS_ASSERTION(count == 0 || aEnable == enabledNow,
"enabling/disabling quirk stylesheet too late");
#ifdef DEBUG_dbaron
if (count != 0 && aEnable == enabledNow)
printf("WARNING: We set the quirks mode too many times.\n"); // we do!
#endif
#endif
mQuirkStyleSheet->SetEnabled(aEnable);
}