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

96031 - Made LI's parent model to be flow entity. This would allow inline elements, such as I,B,FONT, etc., to contain LI such that bullets / numbers would also inherit the parent properties.

Browse Source 
93574 -  nsLoggingSink and nsHTMLNullSink  should not be a part of the optimized build. Wrapped 'em under MOZ_DEBUG flag.
r=heikki, sr=vidur, a=asa.


git-svn-id: svn://10.0.0.236/trunk@102098 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
harishd%netscape.com 2001-08-31 21:22:16 +00:00
parent b46493006c
commit f4d6d67500
16 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/htmlparser/public/Makefile.in
View File

@ -49,7 +49,7 @@ EXPORTS = \
nsToken.h \
$(NULL)
ifndef MOZ_DISABLE_DTD_DEBUG
ifdef MOZ_DEBUG
EXPORTS += \
nsILoggingSink.h \
$(NULL)

2
mozilla/htmlparser/public/makefile.win
View File

@ -44,7 +44,7 @@ EXPORTS = \
nsParserError.h \
nsParserCIID.h \
nsToken.h \
!if !defined(MOZ_DISABLE_DTD_DEBUG)
!ifdef MOZ_DEBUG
nsILoggingSink.h \
!endif
$(NULL)

2
mozilla/htmlparser/public/nsIHTMLContentSink.h
View File

@ -257,7 +257,7 @@ public:
};
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
#include "nshtmlpars.h"
extern NS_HTMLPARS nsresult NS_NewHTMLNullSink(nsIContentSink** aInstancePtrResult);

8
mozilla/htmlparser/src/CNavDTD.cpp
View File

@ -53,7 +53,7 @@
#include "nsReadableUtils.h"
#include "prmem.h"
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
#include "nsLoggingSink.h"
#endif
@ -198,7 +198,7 @@ const nsIID& CNavDTD::GetMostDerivedIID(void)const {
}
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
nsLoggingSink* GetLoggingSink() {
@ -260,7 +260,7 @@ CNavDTD::~CNavDTD(){
}
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
if(mSink) {
nsLoggingSink *theLogSink=GetLoggingSink();
if(mSink==theLogSink) {
@ -394,7 +394,7 @@ nsresult CNavDTD::WillBuildModel( const CParserContext& aParserContext,nsIConte
//a logging sink. If so, then we'll create one, and make it the
//proxy for the real sink we're given from the parser.
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
nsLoggingSink *theLogSink=GetLoggingSink();
if(theLogSink) {
theLogSink->SetProxySink(mSink);

2
mozilla/htmlparser/src/Makefile.in
View File

@ -65,7 +65,7 @@ CPPSRCS = \
nsParserMsgUtils.cpp\
$(NULL)
ifndef MOZ_DISABLE_DTD_DEBUG
ifdef MOZ_DEBUG
CPPSRCS += \
nsLoggingSink.cpp \
nsHTMLNullSink.cpp \

4
mozilla/htmlparser/src/makefile.win
View File

@ -49,7 +49,7 @@ CPPSRCS = \
nsViewSourceHTML.cpp\
nsParserModule.cpp \
nsParserMsgUtils.cpp \
!if !defined(MOZ_DISABLE_DTD_DEBUG)
!ifdef MOZ_DEBUG
nsLoggingSink.cpp \
nsHTMLNullSink.cpp \
!endif
@ -74,7 +74,7 @@ CPP_OBJS = \
.\$(OBJDIR)\nsViewSourceHTML.obj\
.\$(OBJDIR)\nsParserModule.obj \
.\$(OBJDIR)\nsParserMsgUtils.obj \
!if !defined(MOZ_DISABLE_DTD_DEBUG)
!ifdef MOZ_DEBUG
.\$(OBJDIR)\nsLoggingSink.obj \
.\$(OBJDIR)\nsHTMLNullSink.obj \
!endif

2
mozilla/htmlparser/src/nsElementTable.cpp
View File

@ -772,7 +772,7 @@ void InitializeElementTable(void) {
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gLIRootTags,&gLIRootTags,
/*autoclose starttags and endtags*/ &gLIAutoClose,0,0,0,
/*parent,incl,exclgroups*/ kBlock, kFlowEntity, kSelf, //changed this from blockentity to block during RS cleanup
/*parent,incl,exclgroups*/ kFlowEntity, kFlowEntity, kSelf, // For compat. sake LI's parent model should be flow - Ref. bug 96031
/*special props, prop-range*/ kNoPropagate|kVerifyHierarchy, kDefaultPropRange,
/*special parents,kids,skip*/ 0,&gLIKids,eHTMLTag_unknown);

6
mozilla/htmlparser/src/nsParserModule.cpp
View File

@ -40,7 +40,7 @@
#include "nsIParserService.h"
#include "nsElementTable.h"
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
#include "nsLoggingSink.h"
#endif
@ -148,7 +148,7 @@ nsParserService::IsBlock(PRInt32 aId, PRBool& aIsBlock) const
//----------------------------------------------------------------------
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLoggingSink)
#endif
@ -162,7 +162,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsParserService)
static nsModuleComponentInfo gComponents[] = {
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
{ "Logging sink", NS_LOGGING_SINK_CID, NULL, nsLoggingSinkConstructor },
#endif

2
mozilla/parser/htmlparser/public/Makefile.in
View File

@ -49,7 +49,7 @@ EXPORTS = \
nsToken.h \
$(NULL)
ifndef MOZ_DISABLE_DTD_DEBUG
ifdef MOZ_DEBUG
EXPORTS += \
nsILoggingSink.h \
$(NULL)

2
mozilla/parser/htmlparser/public/makefile.win
View File

@ -44,7 +44,7 @@ EXPORTS = \
nsParserError.h \
nsParserCIID.h \
nsToken.h \
!if !defined(MOZ_DISABLE_DTD_DEBUG)
!ifdef MOZ_DEBUG
nsILoggingSink.h \
!endif
$(NULL)

2
mozilla/parser/htmlparser/public/nsIHTMLContentSink.h
View File

@ -257,7 +257,7 @@ public:
};
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
#include "nshtmlpars.h"
extern NS_HTMLPARS nsresult NS_NewHTMLNullSink(nsIContentSink** aInstancePtrResult);

8
mozilla/parser/htmlparser/src/CNavDTD.cpp
View File

@ -53,7 +53,7 @@
#include "nsReadableUtils.h"
#include "prmem.h"
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
#include "nsLoggingSink.h"
#endif
@ -198,7 +198,7 @@ const nsIID& CNavDTD::GetMostDerivedIID(void)const {
}
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
nsLoggingSink* GetLoggingSink() {
@ -260,7 +260,7 @@ CNavDTD::~CNavDTD(){
}
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
if(mSink) {
nsLoggingSink *theLogSink=GetLoggingSink();
if(mSink==theLogSink) {
@ -394,7 +394,7 @@ nsresult CNavDTD::WillBuildModel( const CParserContext& aParserContext,nsIConte
//a logging sink. If so, then we'll create one, and make it the
//proxy for the real sink we're given from the parser.
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
nsLoggingSink *theLogSink=GetLoggingSink();
if(theLogSink) {
theLogSink->SetProxySink(mSink);

2
mozilla/parser/htmlparser/src/Makefile.in
View File

@ -65,7 +65,7 @@ CPPSRCS = \
nsParserMsgUtils.cpp\
$(NULL)
ifndef MOZ_DISABLE_DTD_DEBUG
ifdef MOZ_DEBUG
CPPSRCS += \
nsLoggingSink.cpp \
nsHTMLNullSink.cpp \

4
mozilla/parser/htmlparser/src/makefile.win
View File

@ -49,7 +49,7 @@ CPPSRCS = \
nsViewSourceHTML.cpp\
nsParserModule.cpp \
nsParserMsgUtils.cpp \
!if !defined(MOZ_DISABLE_DTD_DEBUG)
!ifdef MOZ_DEBUG
nsLoggingSink.cpp \
nsHTMLNullSink.cpp \
!endif
@ -74,7 +74,7 @@ CPP_OBJS = \
.\$(OBJDIR)\nsViewSourceHTML.obj\
.\$(OBJDIR)\nsParserModule.obj \
.\$(OBJDIR)\nsParserMsgUtils.obj \
!if !defined(MOZ_DISABLE_DTD_DEBUG)
!ifdef MOZ_DEBUG
.\$(OBJDIR)\nsLoggingSink.obj \
.\$(OBJDIR)\nsHTMLNullSink.obj \
!endif

2
mozilla/parser/htmlparser/src/nsElementTable.cpp
View File

@ -772,7 +772,7 @@ void InitializeElementTable(void) {
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
/*rootnodes,endrootnodes*/ &gLIRootTags,&gLIRootTags,
/*autoclose starttags and endtags*/ &gLIAutoClose,0,0,0,
/*parent,incl,exclgroups*/ kBlock, kFlowEntity, kSelf, //changed this from blockentity to block during RS cleanup
/*parent,incl,exclgroups*/ kFlowEntity, kFlowEntity, kSelf, // For compat. sake LI's parent model should be flow - Ref. bug 96031
/*special props, prop-range*/ kNoPropagate|kVerifyHierarchy, kDefaultPropRange,
/*special parents,kids,skip*/ 0,&gLIKids,eHTMLTag_unknown);

6
mozilla/parser/htmlparser/src/nsParserModule.cpp
View File

@ -40,7 +40,7 @@
#include "nsIParserService.h"
#include "nsElementTable.h"
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
#include "nsLoggingSink.h"
#endif
@ -148,7 +148,7 @@ nsParserService::IsBlock(PRInt32 aId, PRBool& aIsBlock) const
//----------------------------------------------------------------------
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLoggingSink)
#endif
@ -162,7 +162,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsParserService)
static nsModuleComponentInfo gComponents[] = {
#if !defined(MOZ_DISABLE_DTD_DEBUG)
#ifdef NS_DEBUG
{ "Logging sink", NS_LOGGING_SINK_CID, NULL, nsLoggingSinkConstructor },
#endif