Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 08:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
to using this interface.  r=waterson
This commit is contained in:
hyatt%netscape.com 2000-01-19 03:10:45 +00:00
parent 0684563f95
commit c22daf14de
9 changed files with 32 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/xml/document/public/MANIFEST
View File

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

1
content/xml/document/public/Makefile.in
View File

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

3
content/xml/document/public/makefile.win
View File

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

23
content/xml/document/src/nsXMLContentSink.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsXMLContentSink.h" #include "nsXMLContentSink.h"
#include "nsIXMLElementFactory.h" #include "nsIElementFactory.h"
#include "nsIParser.h" #include "nsIParser.h"
#include "nsIUnicharInputStream.h" #include "nsIUnicharInputStream.h"
#include "nsIDocument.h" #include "nsIDocument.h"
@ -1853,7 +1853,7 @@ nsXMLContentSink::RefreshIfEnabled(nsIViewManager* vm)
// XML Element Factory // XML Element Factory
// //
class XMLElementFactoryImpl : public nsIXMLElementFactory class XMLElementFactoryImpl : public nsIElementFactory
{ {
protected: protected:
XMLElementFactoryImpl(); XMLElementFactoryImpl();
@ -1862,13 +1862,13 @@ protected:
public: public:
friend friend
nsresult nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult); NS_NewXMLElementFactory(nsIElementFactory** aResult);
// nsISupports interface // nsISupports interface
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
// nsIXMLElementFactory interface // nsIElementFactory interface
NS_IMETHOD CreateInstanceByTag(const nsString& aTag, nsIXMLContent** aResult); 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 nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult) NS_NewXMLElementFactory(nsIElementFactory** aResult)
{ {
NS_PRECONDITION(aResult != nsnull, "null ptr"); NS_PRECONDITION(aResult != nsnull, "null ptr");
if (! aResult) if (! aResult)
@ -1905,12 +1905,17 @@ NS_NewXMLElementFactory(nsIXMLElementFactory** aResult)
NS_IMETHODIMP NS_IMETHODIMP
XMLElementFactoryImpl::CreateInstanceByTag(const nsString& aTag, nsIXMLContent** aResult) XMLElementFactoryImpl::CreateInstanceByTag(const nsString& aTag, nsIContent** aResult)
{ {
nsCOMPtr<nsIAtom> tag = dont_AddRef(NS_NewAtom(aTag)); nsCOMPtr<nsIAtom> tag = dont_AddRef(NS_NewAtom(aTag));
if (! tag) if (! tag)
return NS_ERROR_OUT_OF_MEMORY; 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
View File

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

1
layout/xml/document/public/Makefile.in
View File

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

3
layout/xml/document/public/makefile.win
View File

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

50
layout/xml/document/public/nsIXMLElementFactory.h
View File

@ -1,50 +0,0 @@
/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* 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 Communicator client 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):
*/
#ifndef nsIXMLElementFactory_h___
#define nsIXMLElementFactory_h___
#include "nslayout.h"
#include "nsISupports.h"
class nsIXMLContent;
class nsString;
// {CF170390-79CC-11d3-BE44-0020A6361667}
#define NS_IXML_ELEMENT_FACTORY_IID \
{ 0xcf170390, 0x79cc, 0x11d3, { 0xbe, 0x44, 0x0, 0x20, 0xa6, 0x36, 0x16, 0x67 } };
/**
* An API for creating XML content objects
*/
class nsIXMLElementFactory : public nsISupports {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IXML_ELEMENT_FACTORY_IID; return iid; }
NS_IMETHOD CreateInstanceByTag(const nsString& aTag,
nsIXMLContent** aResult) = 0;
};
extern nsresult
NS_NewXMLElementFactory(nsIXMLElementFactory** aResult);
#endif /* nsIXMLElementFactory_h___ */

23
layout/xml/document/src/nsXMLContentSink.cpp
View File

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