mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Adding a generic element creation interface. Converting the XML factory over 

to using this interface.  r=waterson
This commit is contained in:
hyatt%netscape.com 2000-01-19 03:10:45 +00:00
Родитель 56b9ebc4b3
Коммит c668589354
9 изменённых файлов: 30 добавлений и 99 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
content/xml/document/public/MANIFEST
Просмотреть файл

@ -1,3 +1,2 @@
nsIXMLContentSink.h
nsIXMLDocument.h
nsIXMLElementFactory.h
nsIXMLDocument.h

1
content/xml/document/public/Makefile.in
Просмотреть файл

@ -31,7 +31,6 @@ MODULE = layout
EXPORTS = \
nsIXMLContentSink.h \
nsIXMLDocument.h \
nsIXMLElementFactory.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

3
content/xml/document/public/makefile.win
Просмотреть файл

@ -24,8 +24,7 @@ DEPTH=..\..\..\..
EXPORTS = \
nsIXMLContentSink.h \
nsIXMLDocument.h \
nsIXMLElementFactory.h \
$(NULL)
$(NULL)
MODULE=raptor

23
content/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -21,7 +21,7 @@
*/
#include "nsCOMPtr.h"
#include "nsXMLContentSink.h"
#include "nsIXMLElementFactory.h"
#include "nsIElementFactory.h"
#include "nsIParser.h"
#include "nsIUnicharInputStream.h"
#include "nsIDocument.h"
@ -1853,7 +1853,7 @@ nsXMLContentSink::RefreshIfEnabled(nsIViewManager* vm)
// XML Element Factory
//
class XMLElementFactoryImpl : public nsIXMLElementFactory
class XMLElementFactoryImpl : public nsIElementFactory
{
protected:
XMLElementFactoryImpl();
@ -1862,13 +1862,13 @@ protected:
public:
friend
nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult);
NS_NewXMLElementFactory(nsIElementFactory** aResult);
// nsISupports interface
NS_DECL_ISUPPORTS
// nsIXMLElementFactory interface
NS_IMETHOD CreateInstanceByTag(const nsString& aTag, nsIXMLContent** aResult);
// nsIElementFactory interface
NS_IMETHOD CreateInstanceByTag(const nsString& aTag, nsIContent** aResult);
};
@ -1883,11 +1883,11 @@ XMLElementFactoryImpl::~XMLElementFactoryImpl()
}
NS_IMPL_ISUPPORTS(XMLElementFactoryImpl, NS_GET_IID(nsIXMLElementFactory));
NS_IMPL_ISUPPORTS(XMLElementFactoryImpl, NS_GET_IID(nsIElementFactory));
nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult)
NS_NewXMLElementFactory(nsIElementFactory** aResult)
{
NS_PRECONDITION(aResult != nsnull, "null ptr");
if (! aResult)
@ -1905,12 +1905,17 @@ NS_NewXMLElementFactory(nsIXMLElementFactory** aResult)
NS_IMETHODIMP
XMLElementFactoryImpl::CreateInstanceByTag(const nsString& aTag, nsIXMLContent** aResult)
XMLElementFactoryImpl::CreateInstanceByTag(const nsString& aTag, nsIContent** aResult)
{
nsCOMPtr<nsIAtom> tag = dont_AddRef(NS_NewAtom(aTag));
if (! tag)
return NS_ERROR_OUT_OF_MEMORY;
return NS_NewXMLElement(aResult, tag);
nsCOMPtr<nsIXMLContent> xmlContent;
nsresult rv = NS_NewXMLElement(getter_AddRefs(xmlContent), tag);
nsCOMPtr<nsIContent> result = do_QueryInterface(xmlContent);
*aResult = result;
NS_IF_ADDREF(*aResult);
return rv;
}

3
layout/xml/document/public/MANIFEST
Просмотреть файл

@ -1,3 +0,0 @@
nsIXMLContentSink.h
nsIXMLDocument.h
nsIXMLElementFactory.h

40
layout/xml/document/public/Makefile.in
Просмотреть файл

@ -1,40 +0,0 @@
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = layout
EXPORTS = \
nsIXMLContentSink.h \
nsIXMLDocument.h \
nsIXMLElementFactory.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk

33
layout/xml/document/public/makefile.win
Просмотреть файл

@ -1,33 +0,0 @@
#!nmake
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
DEPTH=..\..\..\..
EXPORTS = \
nsIXMLContentSink.h \
nsIXMLDocument.h \
nsIXMLElementFactory.h \
$(NULL)
MODULE=raptor
include <$(DEPTH)\config\rules.mak>

0
layout/xml/document/public/nsIXMLElementFactory.h
Просмотреть файл

23
layout/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -21,7 +21,7 @@
*/
#include "nsCOMPtr.h"
#include "nsXMLContentSink.h"
#include "nsIXMLElementFactory.h"
#include "nsIElementFactory.h"
#include "nsIParser.h"
#include "nsIUnicharInputStream.h"
#include "nsIDocument.h"
@ -1853,7 +1853,7 @@ nsXMLContentSink::RefreshIfEnabled(nsIViewManager* vm)
// XML Element Factory
//
class XMLElementFactoryImpl : public nsIXMLElementFactory
class XMLElementFactoryImpl : public nsIElementFactory
{
protected:
XMLElementFactoryImpl();
@ -1862,13 +1862,13 @@ protected:
public:
friend
nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult);
NS_NewXMLElementFactory(nsIElementFactory** aResult);
// nsISupports interface
NS_DECL_ISUPPORTS
// nsIXMLElementFactory interface
NS_IMETHOD CreateInstanceByTag(const nsString& aTag, nsIXMLContent** aResult);
// nsIElementFactory interface
NS_IMETHOD CreateInstanceByTag(const nsString& aTag, nsIContent** aResult);
};
@ -1883,11 +1883,11 @@ XMLElementFactoryImpl::~XMLElementFactoryImpl()
}
NS_IMPL_ISUPPORTS(XMLElementFactoryImpl, NS_GET_IID(nsIXMLElementFactory));
NS_IMPL_ISUPPORTS(XMLElementFactoryImpl, NS_GET_IID(nsIElementFactory));
nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult)
NS_NewXMLElementFactory(nsIElementFactory** aResult)
{
NS_PRECONDITION(aResult != nsnull, "null ptr");
if (! aResult)
@ -1905,12 +1905,17 @@ NS_NewXMLElementFactory(nsIXMLElementFactory** aResult)
NS_IMETHODIMP
XMLElementFactoryImpl::CreateInstanceByTag(const nsString& aTag, nsIXMLContent** aResult)
XMLElementFactoryImpl::CreateInstanceByTag(const nsString& aTag, nsIContent** aResult)
{
nsCOMPtr<nsIAtom> tag = dont_AddRef(NS_NewAtom(aTag));
if (! tag)
return NS_ERROR_OUT_OF_MEMORY;
return NS_NewXMLElement(aResult, tag);
nsCOMPtr<nsIXMLContent> xmlContent;
nsresult rv = NS_NewXMLElement(getter_AddRefs(xmlContent), tag);
nsCOMPtr<nsIContent> result = do_QueryInterface(xmlContent);
*aResult = result;
NS_IF_ADDREF(*aResult);
return rv;
}