Code cleanup, XSL->MOZ_XSL, r=nisheeth, a=waterson

This commit is contained in:
axel%pike.org 2000-06-14 07:35:26 +00:00
Родитель 535ca166a8
Коммит fe14e09553
24 изменённых файлов: 78 добавлений и 68 удалений

Просмотреть файл

@ -28,7 +28,7 @@
class nsIAtom;
class nsICSSLoader;
#ifdef XSL
#ifdef MOZ_XSL
class nsITransformMediator;
#endif
@ -46,7 +46,7 @@ public:
// XXX This (or a variant thereof) should be in a DOM interface.
// Since it isn't, we add it here temporarily
NS_IMETHOD GetContentById(const nsString& aName, nsIContent** aContent)=0;
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHOD SetTransformMediator(nsITransformMediator* aMediator)=0;
#endif
};

Просмотреть файл

@ -45,7 +45,8 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_HTML
ifdef MOZ_XSL
DEFINES += -DXSL
INCLUDES += -I$(srcdir)
INCLUDES += -I$(srcdir)/../../../xsl/document/src
endif

Просмотреть файл

@ -25,9 +25,9 @@ LIBRARY_NAME=raptorxmldoc_s
MODULE=raptor
REQUIRES=xpcom raptor pref
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN \
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(MOZ_XSL)
-DXSL
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \

Просмотреть файл

@ -64,7 +64,7 @@
#include "prtime.h"
#include "prlog.h"
#include "prmem.h"
#ifdef XSL
#ifdef MOZ_XSL
#include "nsXSLContentSink.h"
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
@ -81,7 +81,7 @@ static char kNameSpaceSeparator = ':';
static char kNameSpaceDef[] = "xmlns";
static char kStyleSheetPI[] = "xml-stylesheet";
#ifdef XSL
#ifdef MOZ_XSL
static char kXSLType[] = "text/xsl";
#endif
@ -95,7 +95,7 @@ static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID);
static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID);
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
static NS_DEFINE_IID(kIDOMCDATASectionIID, NS_IDOMCDATASECTION_IID);
#ifdef XSL
#ifdef MOZ_XSL
static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
@ -172,7 +172,7 @@ nsXMLContentSink::nsXMLContentSink()
mInScript = PR_FALSE;
mStyleSheetCount = 0;
mCSSLoader = nsnull;
#ifdef XSL
#ifdef MOZ_XSL
mXSLTransformMediator = nsnull;
#endif
}
@ -204,7 +204,7 @@ nsXMLContentSink::~nsXMLContentSink()
PR_FREEIF(mText);
}
NS_IF_RELEASE(mCSSLoader);
#ifdef XSL
#ifdef MOZ_XSL
NS_IF_RELEASE(mXSLTransformMediator);
#endif
}
@ -246,7 +246,7 @@ nsXMLContentSink::Init(nsIDocument* aDoc,
return aDoc->GetNodeInfoManager(*getter_AddRefs(mNodeInfoManager));
}
#ifndef XSL
#ifndef MOZ_XSL
NS_IMPL_ADDREF(nsXMLContentSink)
NS_IMPL_RELEASE(nsXMLContentSink)
@ -261,7 +261,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsXMLContentSink)
NS_INTERFACE_MAP_BEGIN(nsXMLContentSink)
NS_INTERFACE_MAP_ENTRY(nsIXMLContentSink)
NS_INTERFACE_MAP_ENTRY(nsIContentSink)
#ifdef XSL
#ifdef MOZ_XSL
NS_INTERFACE_MAP_ENTRY(nsIObserver)
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
#endif
@ -294,7 +294,7 @@ nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
}
}
#ifndef XSL
#ifndef MOZ_XSL
StartLayoutProcess();
#else
nsresult rv;
@ -326,7 +326,7 @@ nsXMLContentSink::StartLayoutProcess()
mDocument->EndLoad();
}
#ifdef XSL
#ifdef MOZ_XSL
// The observe method is called on completion of the transform. The nsISupports argument is an
// nsIDOMElement interface to the root node of the output content model.
NS_IMETHODIMP
@ -768,7 +768,7 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
// For XSL, we need to wait till after the transform
// to set the root content object. Hence, the following
// ifndef.
#ifndef XSL
#ifndef MOZ_XSL
mDocument->SetRootContent(mDocElement);
#endif
}
@ -1093,7 +1093,7 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
aType.StripWhitespace();
}
#ifdef XSL
#ifdef MOZ_XSL
nsresult
nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
const nsAutoString& aHref)
@ -1295,7 +1295,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
media.ToLowerCase();
}
result = GetQuotedAttributeValue(text, NS_ConvertASCIItoUCS2("alternate"), alternate);
#ifndef XSL
#ifndef MOZ_XSL
result = ProcessCSSStyleLink(node, href, alternate.EqualsWithConversion("yes"),
title, type, media);
#else

Просмотреть файл

@ -26,7 +26,7 @@
#include "nsIXMLContentSink.h"
#include "nsIViewManager.h"
#include "nsIScrollableView.h"
#ifdef XSL
#ifdef MOZ_XSL
#include "nsIObserver.h"
#include "nsWeakReference.h"
#include "nsITransformMediator.h"
@ -59,7 +59,7 @@ typedef enum {
// XXX Till the parser knows a little bit more about XML,
// this is a HTMLContentSink.
class nsXMLContentSink : public nsIXMLContentSink,
#ifdef XSL
#ifdef MOZ_XSL
public nsIObserver,
public nsSupportsWeakReference,
#endif
@ -100,7 +100,7 @@ public:
NS_IMETHOD AddNotation(const nsIParserNode& aNode);
NS_IMETHOD AddEntityReference(const nsIParserNode& aNode);
#ifdef XSL
#ifdef MOZ_XSL
// nsIObserver
NS_IMETHOD Observe(nsISupports *aSubject,
const PRUnichar *aTopic,
@ -142,7 +142,7 @@ protected:
const nsString& aHref, PRBool aAlternate,
const nsString& aTitle, const nsString& aType,
const nsString& aMedia);
#ifdef XSL
#ifdef MOZ_XSL
nsresult ProcessStyleLink(nsIContent* aElement,
const nsString& aHref, PRBool aAlternate,
const nsString& aTitle, const nsString& aType,
@ -195,7 +195,7 @@ protected:
PRInt32 mStyleSheetCount;
nsICSSLoader* mCSSLoader;
nsCOMPtr<nsINodeInfoManager> mNodeInfoManager;
#ifdef XSL
#ifdef MOZ_XSL
nsITransformMediator* mXSLTransformMediator; // Weak reference
#endif
};

Просмотреть файл

@ -157,7 +157,7 @@ nsXMLDocument::nsXMLDocument(nsIURI* aBaseURI)
mDocumentURL = aBaseURI;
NS_IF_ADDREF(mDocumentURL);
#ifdef XSL
#ifdef MOZ_XSL
mTransformMediator = nsnull;
#endif
}
@ -177,7 +177,7 @@ nsXMLDocument::~nsXMLDocument()
mCSSLoader->DropDocumentReference();
NS_RELEASE(mCSSLoader);
}
#ifdef XSL
#ifdef MOZ_XSL
NS_IF_RELEASE(mTransformMediator);
#endif
}
@ -879,7 +879,7 @@ nsXMLDocument::GetContentById(const nsString& aName, nsIContent** aContent)
return NS_OK;
}
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHODIMP
nsXMLDocument::SetTransformMediator(nsITransformMediator* aMediator)
{

Просмотреть файл

@ -26,7 +26,7 @@
#include "nsMarkupDocument.h"
#include "nsIXMLDocument.h"
#include "nsIHTMLContentContainer.h"
#ifdef XSL
#ifdef MOZ_XSL
#include "nsITransformMediator.h"
#endif
@ -84,7 +84,7 @@ public:
// nsIXMLDocument interface
NS_IMETHOD GetContentById(const nsString& aName, nsIContent** aContent);
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHOD SetTransformMediator(nsITransformMediator* aMediator);
#endif
@ -104,7 +104,7 @@ protected:
nsIParser *mParser;
nsICSSLoader* mCSSLoader;
#ifdef XSL
#ifdef MOZ_XSL
nsITransformMediator* mTransformMediator;
#endif
};

Просмотреть файл

@ -26,7 +26,7 @@ include $(topsrcdir)/config/config.mk
LIBRARY_NAME = raptorxsldoc_s
DEFINES += -D_IMPL_NS_HTML -DXSL
DEFINES += -D_IMPL_NS_HTML
XPIDLSRCS= \
nsIDocumentTransformer.idl \
@ -39,7 +39,6 @@ CPPSRCS = \
EXPORTS = \
nsITransformMediator.h \
nsXSLContentSink.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

Просмотреть файл

@ -25,9 +25,9 @@ LIBRARY_NAME=raptorxsldoc_s
MODULE=raptor
REQUIRES=xpcom raptor pref
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN \
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(MOZ_XSL)
-DXSL
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
XPIDLSRCS= .\nsIDocumentTransformer.idl \

Просмотреть файл

@ -2176,7 +2176,7 @@ nsXULDocument::GetContentById(const nsString& aName, nsIContent** aContent)
return NS_ERROR_NOT_IMPLEMENTED;
}
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHODIMP
nsXULDocument::SetTransformMediator(nsITransformMediator* aMediator)
{

Просмотреть файл

@ -304,7 +304,7 @@ public:
// nsIXMLDocument interface
NS_IMETHOD GetContentById(const nsString& aName, nsIContent** aContent);
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHOD SetTransformMediator(nsITransformMediator* aMediator);
#endif

Просмотреть файл

@ -90,6 +90,12 @@ SHARED_LIBRARY_LIBS += \
$(NSNULL)
endif
ifdef MOZ_XSL
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/libraptorxsldoc_s.$(LIB_SUFFIX) \
$(NSNULL)
endif
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(EXTRA_DSO_LIBS) \

Просмотреть файл

@ -28,7 +28,7 @@
class nsIAtom;
class nsICSSLoader;
#ifdef XSL
#ifdef MOZ_XSL
class nsITransformMediator;
#endif
@ -46,7 +46,7 @@ public:
// XXX This (or a variant thereof) should be in a DOM interface.
// Since it isn't, we add it here temporarily
NS_IMETHOD GetContentById(const nsString& aName, nsIContent** aContent)=0;
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHOD SetTransformMediator(nsITransformMediator* aMediator)=0;
#endif
};

Просмотреть файл

@ -45,7 +45,8 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_HTML
ifdef MOZ_XSL
DEFINES += -DXSL
INCLUDES += -I$(srcdir)
INCLUDES += -I$(srcdir)/../../../xsl/document/src
endif

Просмотреть файл

@ -25,9 +25,9 @@ LIBRARY_NAME=raptorxmldoc_s
MODULE=raptor
REQUIRES=xpcom raptor pref
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN \
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(MOZ_XSL)
-DXSL
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \

Просмотреть файл

@ -64,7 +64,7 @@
#include "prtime.h"
#include "prlog.h"
#include "prmem.h"
#ifdef XSL
#ifdef MOZ_XSL
#include "nsXSLContentSink.h"
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
@ -81,7 +81,7 @@ static char kNameSpaceSeparator = ':';
static char kNameSpaceDef[] = "xmlns";
static char kStyleSheetPI[] = "xml-stylesheet";
#ifdef XSL
#ifdef MOZ_XSL
static char kXSLType[] = "text/xsl";
#endif
@ -95,7 +95,7 @@ static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID);
static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID);
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
static NS_DEFINE_IID(kIDOMCDATASectionIID, NS_IDOMCDATASECTION_IID);
#ifdef XSL
#ifdef MOZ_XSL
static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
@ -172,7 +172,7 @@ nsXMLContentSink::nsXMLContentSink()
mInScript = PR_FALSE;
mStyleSheetCount = 0;
mCSSLoader = nsnull;
#ifdef XSL
#ifdef MOZ_XSL
mXSLTransformMediator = nsnull;
#endif
}
@ -204,7 +204,7 @@ nsXMLContentSink::~nsXMLContentSink()
PR_FREEIF(mText);
}
NS_IF_RELEASE(mCSSLoader);
#ifdef XSL
#ifdef MOZ_XSL
NS_IF_RELEASE(mXSLTransformMediator);
#endif
}
@ -246,7 +246,7 @@ nsXMLContentSink::Init(nsIDocument* aDoc,
return aDoc->GetNodeInfoManager(*getter_AddRefs(mNodeInfoManager));
}
#ifndef XSL
#ifndef MOZ_XSL
NS_IMPL_ADDREF(nsXMLContentSink)
NS_IMPL_RELEASE(nsXMLContentSink)
@ -261,7 +261,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsXMLContentSink)
NS_INTERFACE_MAP_BEGIN(nsXMLContentSink)
NS_INTERFACE_MAP_ENTRY(nsIXMLContentSink)
NS_INTERFACE_MAP_ENTRY(nsIContentSink)
#ifdef XSL
#ifdef MOZ_XSL
NS_INTERFACE_MAP_ENTRY(nsIObserver)
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
#endif
@ -294,7 +294,7 @@ nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
}
}
#ifndef XSL
#ifndef MOZ_XSL
StartLayoutProcess();
#else
nsresult rv;
@ -326,7 +326,7 @@ nsXMLContentSink::StartLayoutProcess()
mDocument->EndLoad();
}
#ifdef XSL
#ifdef MOZ_XSL
// The observe method is called on completion of the transform. The nsISupports argument is an
// nsIDOMElement interface to the root node of the output content model.
NS_IMETHODIMP
@ -768,7 +768,7 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
// For XSL, we need to wait till after the transform
// to set the root content object. Hence, the following
// ifndef.
#ifndef XSL
#ifndef MOZ_XSL
mDocument->SetRootContent(mDocElement);
#endif
}
@ -1093,7 +1093,7 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
aType.StripWhitespace();
}
#ifdef XSL
#ifdef MOZ_XSL
nsresult
nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
const nsAutoString& aHref)
@ -1295,7 +1295,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
media.ToLowerCase();
}
result = GetQuotedAttributeValue(text, NS_ConvertASCIItoUCS2("alternate"), alternate);
#ifndef XSL
#ifndef MOZ_XSL
result = ProcessCSSStyleLink(node, href, alternate.EqualsWithConversion("yes"),
title, type, media);
#else

Просмотреть файл

@ -26,7 +26,7 @@
#include "nsIXMLContentSink.h"
#include "nsIViewManager.h"
#include "nsIScrollableView.h"
#ifdef XSL
#ifdef MOZ_XSL
#include "nsIObserver.h"
#include "nsWeakReference.h"
#include "nsITransformMediator.h"
@ -59,7 +59,7 @@ typedef enum {
// XXX Till the parser knows a little bit more about XML,
// this is a HTMLContentSink.
class nsXMLContentSink : public nsIXMLContentSink,
#ifdef XSL
#ifdef MOZ_XSL
public nsIObserver,
public nsSupportsWeakReference,
#endif
@ -100,7 +100,7 @@ public:
NS_IMETHOD AddNotation(const nsIParserNode& aNode);
NS_IMETHOD AddEntityReference(const nsIParserNode& aNode);
#ifdef XSL
#ifdef MOZ_XSL
// nsIObserver
NS_IMETHOD Observe(nsISupports *aSubject,
const PRUnichar *aTopic,
@ -142,7 +142,7 @@ protected:
const nsString& aHref, PRBool aAlternate,
const nsString& aTitle, const nsString& aType,
const nsString& aMedia);
#ifdef XSL
#ifdef MOZ_XSL
nsresult ProcessStyleLink(nsIContent* aElement,
const nsString& aHref, PRBool aAlternate,
const nsString& aTitle, const nsString& aType,
@ -195,7 +195,7 @@ protected:
PRInt32 mStyleSheetCount;
nsICSSLoader* mCSSLoader;
nsCOMPtr<nsINodeInfoManager> mNodeInfoManager;
#ifdef XSL
#ifdef MOZ_XSL
nsITransformMediator* mXSLTransformMediator; // Weak reference
#endif
};

Просмотреть файл

@ -157,7 +157,7 @@ nsXMLDocument::nsXMLDocument(nsIURI* aBaseURI)
mDocumentURL = aBaseURI;
NS_IF_ADDREF(mDocumentURL);
#ifdef XSL
#ifdef MOZ_XSL
mTransformMediator = nsnull;
#endif
}
@ -177,7 +177,7 @@ nsXMLDocument::~nsXMLDocument()
mCSSLoader->DropDocumentReference();
NS_RELEASE(mCSSLoader);
}
#ifdef XSL
#ifdef MOZ_XSL
NS_IF_RELEASE(mTransformMediator);
#endif
}
@ -879,7 +879,7 @@ nsXMLDocument::GetContentById(const nsString& aName, nsIContent** aContent)
return NS_OK;
}
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHODIMP
nsXMLDocument::SetTransformMediator(nsITransformMediator* aMediator)
{

Просмотреть файл

@ -26,7 +26,7 @@
#include "nsMarkupDocument.h"
#include "nsIXMLDocument.h"
#include "nsIHTMLContentContainer.h"
#ifdef XSL
#ifdef MOZ_XSL
#include "nsITransformMediator.h"
#endif
@ -84,7 +84,7 @@ public:
// nsIXMLDocument interface
NS_IMETHOD GetContentById(const nsString& aName, nsIContent** aContent);
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHOD SetTransformMediator(nsITransformMediator* aMediator);
#endif
@ -104,7 +104,7 @@ protected:
nsIParser *mParser;
nsICSSLoader* mCSSLoader;
#ifdef XSL
#ifdef MOZ_XSL
nsITransformMediator* mTransformMediator;
#endif
};

Просмотреть файл

@ -26,7 +26,7 @@ include $(topsrcdir)/config/config.mk
LIBRARY_NAME = raptorxsldoc_s
DEFINES += -D_IMPL_NS_HTML -DXSL
DEFINES += -D_IMPL_NS_HTML
XPIDLSRCS= \
nsIDocumentTransformer.idl \
@ -39,7 +39,6 @@ CPPSRCS = \
EXPORTS = \
nsITransformMediator.h \
nsXSLContentSink.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

Просмотреть файл

@ -25,9 +25,9 @@ LIBRARY_NAME=raptorxsldoc_s
MODULE=raptor
REQUIRES=xpcom raptor pref
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN \
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(MOZ_XSL)
-DXSL
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
XPIDLSRCS= .\nsIDocumentTransformer.idl \

Просмотреть файл

@ -24,6 +24,10 @@ MODULE=rdf
LIBRARY_NAME=rdfcontent_s
DEFINES=-D_IMPL_NS_DOM
!if defined(MOZ_XSL)
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
LCFLAGS = \
$(LCFLAGS) \

Просмотреть файл

@ -2176,7 +2176,7 @@ nsXULDocument::GetContentById(const nsString& aName, nsIContent** aContent)
return NS_ERROR_NOT_IMPLEMENTED;
}
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHODIMP
nsXULDocument::SetTransformMediator(nsITransformMediator* aMediator)
{

Просмотреть файл

@ -304,7 +304,7 @@ public:
// nsIXMLDocument interface
NS_IMETHOD GetContentById(const nsString& aName, nsIContent** aContent);
#ifdef XSL
#ifdef MOZ_XSL
NS_IMETHOD SetTransformMediator(nsITransformMediator* aMediator);
#endif