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

Add support for loading an XML document from script within a XUL document also.

Browse Source
This commit is contained in:
nisheeth%netscape.com 2000-05-10 23:02:32 +00:00
parent c644256624
commit 2277ba5c45
12 changed files with 217 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
content/base/public/nsIPrivateDOMImplementation.h Normal file
View File

@ -0,0 +1,49 @@
/* -*- 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.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):
*/
#ifndef nsIPrivateDOMImplementation_h__
#define nsIPrivateDOMImplementation_h__
#include "nsISupports.h"
class nsIDocument;
/*
* Event listener manager interface.
*/
#define NS_IPRIVATEDOMIMPLEMENTATION_IID \
{ /* d3205fb8-2652-11d4-ba06-0060b0fc76dd */ \
0xd3205fb8, 0x2652, 0x11d4, \
{0xba, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x76, 0xdd} }
class nsIPrivateDOMImplementation : public nsISupports {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IPRIVATEDOMIMPLEMENTATION_IID; return iid; }
NS_IMETHOD Init(nsIDocument* aDoc) = 0;
};
NS_LAYOUT nsresult
NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult);
#endif // nsIPrivateDOMImplementation_h__

35
content/base/src/nsDocument.cpp
View File

@ -92,6 +92,7 @@
#include "nsIScriptSecurityManager.h"
#include "nsIAggregatePrincipal.h"
#include "nsIPrivateDOMImplementation.h"
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID);
@ -116,6 +117,7 @@ static NS_DEFINE_IID(kIDOMRange, NS_IDOMRANGE_IID);
static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID);
static NS_DEFINE_IID(kIDOMScriptObjectFactoryIID, NS_IDOM_SCRIPT_OBJECT_FACTORY_IID);
static NS_DEFINE_IID(kDOMScriptObjectFactoryCID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
static NS_DEFINE_IID(kIPrivateDOMImplementationIID, NS_IPRIVATEDOMIMPLEMENTATION_IID);
#include "nsILineBreakerFactory.h"
@ -367,7 +369,8 @@ nsDOMStyleSheetList::DocumentWillBeDestroyed(nsIDocument *aDocument)
// ==================================================================
class nsDOMImplementation : public nsIDOMDOMImplementation,
public nsIScriptObjectOwner
public nsIScriptObjectOwner,
public nsIPrivateDOMImplementation
{
public:
nsDOMImplementation(nsIDocument* aDocument = nsnull);
@ -375,6 +378,7 @@ public:
NS_DECL_ISUPPORTS
// nsIDOMDOMImplementation
NS_IMETHOD HasFeature(const nsString& aFeature,
const nsString& aVersion,
PRBool* aReturn);
@ -388,14 +392,28 @@ public:
nsIDOMDocumentType* aDoctype,
nsIDOMDocument** aReturn);
// nsIScriptObjectOwner
NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
NS_IMETHOD SetScriptObject(void *aScriptObject);
//nsIPrivateDOMImplementation
NS_IMETHOD Init(nsIDocument* aDoc);
protected:
void *mScriptObject;
nsCOMPtr<nsIDocument> mDocument;
};
NS_LAYOUT nsresult
NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult)
{
nsDOMImplementation* domImpl = new nsDOMImplementation();
if (domImpl == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
return domImpl->QueryInterface(kIDOMDOMImplementationIID, (void**) aInstancePtrResult);
}
nsDOMImplementation::nsDOMImplementation(nsIDocument* aDocument)
{
NS_INIT_REFCNT();
@ -422,6 +440,12 @@ nsDOMImplementation::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIPrivateDOMImplementationIID)) {
nsIPrivateDOMImplementation* tmp = this;
*aInstancePtr = (void*) tmp;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIScriptObjectOwnerIID)) {
nsIScriptObjectOwner* tmp = this;
*aInstancePtr = (void*) tmp;
@ -526,6 +550,13 @@ nsDOMImplementation::SetScriptObject(void *aScriptObject)
return NS_OK;
}
NS_IMETHODIMP
nsDOMImplementation::Init(nsIDocument* aDoc)
{
mDocument = aDoc;
return NS_OK;
}
// ==================================================================
// =
// ==================================================================
@ -1953,7 +1984,7 @@ nsDocument::CreateElement(const nsString& aTagName,
// Should be implemented by subclass
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsDocument::CreateTextNode(const nsString& aData, nsIDOMText** aReturn)
{

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

@ -122,6 +122,8 @@
#include "rdf.h"
#include "rdfutil.h"
#include "nsIFrame.h"
#include "nsIPrivateDOMImplementation.h"
#include "nsIDOMDOMImplementation.h"
#include "nsINodeInfo.h"
//----------------------------------------------------------------------
@ -156,6 +158,7 @@ static NS_DEFINE_CID(kXULContentUtilsCID, NS_XULCONTENTUTILS_CID);
static NS_DEFINE_CID(kXULKeyListenerCID, NS_XULKEYLISTENER_CID);
static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
static NS_DEFINE_CID(kXULTemplateBuilderCID, NS_XULTEMPLATEBUILDER_CID);
static NS_DEFINE_CID(kDOMImplementationCID, NS_DOM_IMPLEMENTATION_CID);
static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
@ -2292,10 +2295,19 @@ nsXULDocument::GetDoctype(nsIDOMDocumentType** aDoctype)
NS_IMETHODIMP
nsXULDocument::GetImplementation(nsIDOMDOMImplementation** aImplementation)
{
NS_NOTREACHED("nsXULDocument::GetImplementation");
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult rv;
rv = nsComponentManager::CreateInstance(kDOMImplementationCID,
nsnull,
NS_GET_IID(nsIDOMDOMImplementation),
(void**) aImplementation);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrivateDOMImplementation> impl = do_QueryInterface(*aImplementation, &rv);
if (NS_FAILED(rv)) return rv;
rv = impl->Init((nsIDocument*) this);
return rv;
}
NS_IMETHODIMP
nsXULDocument::GetDocumentElement(nsIDOMElement** aDocumentElement)

1
layout/base/public/MANIFEST
View File

@ -56,3 +56,4 @@ nsILayoutHistoryState.h
nsIStatefulFrame.h
nsISelfScrollingFrame.h
nsIScrollableFrame.h
nsIPrivateDOMImplementation.h

7
layout/base/public/Makefile.in
View File

@ -84,13 +84,14 @@ nsILayoutHistoryState.h \
nsIStatefulFrame.h \
nsISelfScrollingFrame.h \
nsIScrollableFrame.h \
nsIPrivateDOMImplementation.h \
$(NULL)
XPIDLSRCS = \
nsIChromeEventHandler.idl \
nsIContentPolicy.idl \
nsISelectionController.idl \
nsIPrintListener.idl \
nsIContentPolicy.idl \
nsISelectionController.idl \
nsIPrintListener.idl \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

1
layout/base/public/makefile.win
View File

@ -77,6 +77,7 @@ EXPORTS = \
nsIStatefulFrame.h \
nsISelfScrollingFrame.h \
nsIScrollableFrame.h \
nsIPrivateDOMImplementation.h \
$(NULL)
MODULE=raptor

49
layout/base/public/nsIPrivateDOMImplementation.h Normal file
View File

@ -0,0 +1,49 @@
/* -*- 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.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):
*/
#ifndef nsIPrivateDOMImplementation_h__
#define nsIPrivateDOMImplementation_h__
#include "nsISupports.h"
class nsIDocument;
/*
* Event listener manager interface.
*/
#define NS_IPRIVATEDOMIMPLEMENTATION_IID \
{ /* d3205fb8-2652-11d4-ba06-0060b0fc76dd */ \
0xd3205fb8, 0x2652, 0x11d4, \
{0xba, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x76, 0xdd} }
class nsIPrivateDOMImplementation : public nsISupports {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IPRIVATEDOMIMPLEMENTATION_IID; return iid; }
NS_IMETHOD Init(nsIDocument* aDoc) = 0;
};
NS_LAYOUT nsresult
NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult);
#endif // nsIPrivateDOMImplementation_h__

35
layout/base/src/nsDocument.cpp
View File

@ -92,6 +92,7 @@
#include "nsIScriptSecurityManager.h"
#include "nsIAggregatePrincipal.h"
#include "nsIPrivateDOMImplementation.h"
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID);
@ -116,6 +117,7 @@ static NS_DEFINE_IID(kIDOMRange, NS_IDOMRANGE_IID);
static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID);
static NS_DEFINE_IID(kIDOMScriptObjectFactoryIID, NS_IDOM_SCRIPT_OBJECT_FACTORY_IID);
static NS_DEFINE_IID(kDOMScriptObjectFactoryCID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
static NS_DEFINE_IID(kIPrivateDOMImplementationIID, NS_IPRIVATEDOMIMPLEMENTATION_IID);
#include "nsILineBreakerFactory.h"
@ -367,7 +369,8 @@ nsDOMStyleSheetList::DocumentWillBeDestroyed(nsIDocument *aDocument)
// ==================================================================
class nsDOMImplementation : public nsIDOMDOMImplementation,
public nsIScriptObjectOwner
public nsIScriptObjectOwner,
public nsIPrivateDOMImplementation
{
public:
nsDOMImplementation(nsIDocument* aDocument = nsnull);
@ -375,6 +378,7 @@ public:
NS_DECL_ISUPPORTS
// nsIDOMDOMImplementation
NS_IMETHOD HasFeature(const nsString& aFeature,
const nsString& aVersion,
PRBool* aReturn);
@ -388,14 +392,28 @@ public:
nsIDOMDocumentType* aDoctype,
nsIDOMDocument** aReturn);
// nsIScriptObjectOwner
NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
NS_IMETHOD SetScriptObject(void *aScriptObject);
//nsIPrivateDOMImplementation
NS_IMETHOD Init(nsIDocument* aDoc);
protected:
void *mScriptObject;
nsCOMPtr<nsIDocument> mDocument;
};
NS_LAYOUT nsresult
NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult)
{
nsDOMImplementation* domImpl = new nsDOMImplementation();
if (domImpl == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
return domImpl->QueryInterface(kIDOMDOMImplementationIID, (void**) aInstancePtrResult);
}
nsDOMImplementation::nsDOMImplementation(nsIDocument* aDocument)
{
NS_INIT_REFCNT();
@ -422,6 +440,12 @@ nsDOMImplementation::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIPrivateDOMImplementationIID)) {
nsIPrivateDOMImplementation* tmp = this;
*aInstancePtr = (void*) tmp;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIScriptObjectOwnerIID)) {
nsIScriptObjectOwner* tmp = this;
*aInstancePtr = (void*) tmp;
@ -526,6 +550,13 @@ nsDOMImplementation::SetScriptObject(void *aScriptObject)
return NS_OK;
}
NS_IMETHODIMP
nsDOMImplementation::Init(nsIDocument* aDoc)
{
mDocument = aDoc;
return NS_OK;
}
// ==================================================================
// =
// ==================================================================
@ -1953,7 +1984,7 @@ nsDocument::CreateElement(const nsString& aTagName,
// Should be implemented by subclass
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsDocument::CreateTextNode(const nsString& aData, nsIDOMText** aReturn)
{

4
layout/build/nsLayoutCID.h
View File

@ -155,6 +155,10 @@
#define NS_AUTOCOPYSERVICE_CID \
{ 0x8775ca39, 0x4072, 0x4cc0, { 0x92, 0xd3, 0xa7, 0xc2, 0xb8, 0x20, 0x8, 0x9c } }
// 3a9cd622-264d-11d4-ba06-0060b0fc76dd
#define NS_DOM_IMPLEMENTATION_CID \
{ 0x3a9cd622, 0x264d, 0x11d4, {0xba, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x76, 0xdd } }
// {AE52FE52-683A-437D-B661-DE55F4E0A873}
#define NS_NODEINFOMANAGER_CID \
{ 0xae52fe52, 0x683a, 0x437d, { 0xb6, 0x61, 0xde, 0x55, 0xf4, 0xe0, 0xa8, 0x73 } }

12
layout/build/nsLayoutFactory.cpp
View File

@ -52,6 +52,8 @@
#include "nsIDocumentEncoder.h"
#include "nsCOMPtr.h"
#include "nsIFrameSelection.h"
#include "nsIDOMDOMImplementation.h"
#include "nsIPrivateDOMImplementation.h"
#include "nsIXBLService.h"
#include "nsIBindingManager.h"
@ -98,10 +100,11 @@ static NS_DEFINE_CID(kTextEncoderCID, NS_TEXT_ENCODER_CID);
static NS_DEFINE_CID(kXBLServiceCID, NS_XBLSERVICE_CID);
static NS_DEFINE_CID(kBindingManagerCID, NS_BINDINGMANAGER_CID);
static NS_DEFINE_CID(kDOMImplementationCID, NS_DOM_IMPLEMENTATION_CID);
static NS_DEFINE_CID(kNodeInfoManagerCID, NS_NODEINFOMANAGER_CID);
static NS_DEFINE_CID(kAutoCopyServiceCID, NS_AUTOCOPYSERVICE_CID);
extern nsresult NS_NewSelection(nsIFrameSelection** aResult);
extern nsresult NS_NewRange(nsIDOMRange** aResult);
extern nsresult NS_NewContentIterator(nsIContentIterator** aResult);
@ -398,6 +401,13 @@ nsLayoutFactory::CreateInstance(nsISupports *aOuter,
return res;
}
}
else if (mClassID.Equals(kDOMImplementationCID)) {
res = NS_NewDOMImplementation((nsIDOMDOMImplementation**) &inst);
if (NS_FAILED(res)) {
LOG_NEW_FAILURE("NS_NewDOMImplementation", res);
return res;
}
}
else {
return NS_NOINTERFACE;
}

2
layout/build/nsLayoutModule.cpp
View File

@ -318,6 +318,8 @@ static Components gComponents[] = {
{ "HTML style sheet", NS_HTMLSTYLESHEET_CID, nsnull, },
{ "HTML-CSS style sheet", NS_HTML_CSS_STYLESHEET_CID, nsnull, },
{ "DOM implementation", NS_DOM_IMPLEMENTATION_CID, nsnull, },
{ "XML document", NS_XMLDOCUMENT_CID, nsnull, },
{ "Image document", NS_IMAGEDOCUMENT_CID, nsnull, },

18
rdf/content/src/nsXULDocument.cpp
View File

@ -122,6 +122,8 @@
#include "rdf.h"
#include "rdfutil.h"
#include "nsIFrame.h"
#include "nsIPrivateDOMImplementation.h"
#include "nsIDOMDOMImplementation.h"
#include "nsINodeInfo.h"
//----------------------------------------------------------------------
@ -156,6 +158,7 @@ static NS_DEFINE_CID(kXULContentUtilsCID, NS_XULCONTENTUTILS_CID);
static NS_DEFINE_CID(kXULKeyListenerCID, NS_XULKEYLISTENER_CID);
static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
static NS_DEFINE_CID(kXULTemplateBuilderCID, NS_XULTEMPLATEBUILDER_CID);
static NS_DEFINE_CID(kDOMImplementationCID, NS_DOM_IMPLEMENTATION_CID);
static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
@ -2292,10 +2295,19 @@ nsXULDocument::GetDoctype(nsIDOMDocumentType** aDoctype)
NS_IMETHODIMP
nsXULDocument::GetImplementation(nsIDOMDOMImplementation** aImplementation)
{
NS_NOTREACHED("nsXULDocument::GetImplementation");
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult rv;
rv = nsComponentManager::CreateInstance(kDOMImplementationCID,
nsnull,
NS_GET_IID(nsIDOMDOMImplementation),
(void**) aImplementation);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrivateDOMImplementation> impl = do_QueryInterface(*aImplementation, &rv);
if (NS_FAILED(rv)) return rv;
rv = impl->Init((nsIDocument*) this);
return rv;
}
NS_IMETHODIMP
nsXULDocument::GetDocumentElement(nsIDOMElement** aDocumentElement)