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

Adding in the new document info class and tweaking the builder so that

Browse Source 
it knows how to use it.
This commit is contained in:
hyatt%netscape.com 1999-03-11 19:49:32 +00:00
parent 09ac24bb6a
commit 5fee22456d
8 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -877,7 +877,7 @@ XULDocumentImpl::StartDocumentLoad(nsIURL *aURL,
return rv;
}
// Create various data sources and builders, but only do this if we're
// Create the composite data source and builder, but only do this if we're
// not a XUL fragment.
if (mFragmentRoot == nsnull) {

1
rdf/content/public/MANIFEST
View File

@ -8,4 +8,5 @@ nsIRDFDocument.h
nsIXULSortService.h
nsIXULParentDocument.h
nsIXULChildDocument.h
nsIXULDocumentInfo.h

1
rdf/content/public/Makefile.in
View File

@ -35,6 +35,7 @@ EXPORTS = \
nsIXULSortService.h \
nsIXULParentDocument.h \
nsIXULChildDocument.h \
nsIXULDocumentInfo.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

1
rdf/content/public/makefile.win
View File

@ -31,6 +31,7 @@ EXPORTS = \
nsIXULSortService.h \
nsIXULParentDocument.h \
nsIXULChildDocument.h \
nsIXULDocumentInfo.h \
$(NULL)
include <$(DEPTH)/config/rules.mak>

1
rdf/content/src/Makefile.in
View File

@ -44,6 +44,7 @@ CPPSRCS = \
nsXULDocument.cpp \
nsXULSortService.cpp \
nsXULTreeElement.cpp \
nsXULDocumentInfo.cpp \
$(NULL)
EXPORTS = \

1
rdf/content/src/makefile.win
View File

@ -42,6 +42,7 @@ CPP_OBJS=\
.\$(OBJDIR)\nsRDFTreeBuilder.obj \
.\$(OBJDIR)\nsRDFXULBuilder.obj \
.\$(OBJDIR)\nsXULDocument.obj \
.\$(OBJDIR)\nsXULDocumentInfo.obj \
.\$(OBJDIR)\nsXULSortService.obj \
.\$(OBJDIR)\nsXULTreeElement.obj \
$(NULL)

76
rdf/content/src/nsRDFXULBuilder.cpp
View File

@ -65,7 +65,10 @@
#include "rdfutil.h"
#include "nsIDOMXULElement.h"
#include "nsIDOMXULDocument.h"
#include "nsIXULDocumentInfo.h"
#include "nsIContentViewerContainer.h"
#include "nsIDocumentLoader.h"
#include "nsIWebshell.h"
// XXX These are needed as scaffolding until we get to a more
// DOM-based solution.
@ -84,6 +87,7 @@ static NS_DEFINE_IID(kIRDFObserverIID, NS_IRDFOBSERVER_IID);
static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
static NS_DEFINE_IID(kIRDFServiceIID, NS_IRDFSERVICE_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIXULDocumentInfoIID, NS_IXULDOCUMENTINFO_IID);
static NS_DEFINE_CID(kNameSpaceManagerCID, NS_NAMESPACEMANAGER_CID);
static NS_DEFINE_CID(kRDFCompositeDataSourceCID, NS_RDFCOMPOSITEDATASOURCE_CID);
@ -91,7 +95,8 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFTreeBuilderCID, NS_RDFTREEBUILDER_CID);
static NS_DEFINE_CID(kRDFMenuBuilderCID, NS_RDFMENUBUILDER_CID);
static NS_DEFINE_CID(kRDFToolbarBuilderCID, NS_RDFTOOLBARBUILDER_CID);
static NS_DEFINE_CID(kCXULDocumentCID, NS_XULDOCUMENT_CID);
static NS_DEFINE_CID(kXULDocumentCID, NS_XULDOCUMENT_CID);
static NS_DEFINE_CID(kXULDocumentInfoCID, NS_XULDOCUMENTINFO_CID);
////////////////////////////////////////////////////////////////////////
// standard vocabulary items
@ -581,17 +586,6 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
// Build a URL object from the attribute's value.
nsCOMPtr<nsIURL> includeURL;
NS_NewURL(getter_AddRefs(includeURL), includeSrc);
nsCOMPtr<nsIDocument> subDocument;
if (NS_FAILED(rv = nsComponentManager::CreateInstance(kCXULDocumentCID,
nsnull,
kIDocumentIID,
(void **)getter_AddRefs(subDocument)))) {
NS_ERROR("Unable to initialize a XUL fragment's subdocument.");
return rv;
}
nsCOMPtr<nsIDocument> parentDoc;
aElement->GetDocument(*getter_AddRefs(parentDoc));
@ -601,10 +595,6 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
return rv;
}
subDocument->SetParentDocument(parentDoc);
parentDoc->AddSubDocument(subDocument);
nsCOMPtr<nsIStreamListener> streamListener;
nsCOMPtr<nsIContentViewerContainer> container;
nsCOMPtr<nsIXULParentDocument> xulParentDocument;
xulParentDocument = do_QueryInterface(parentDoc);
@ -624,15 +614,6 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
return rv;
}
char* commandChars = command.ToNewCString();
nsCOMPtr<nsIXULChildDocument> xulChildDocument;
xulChildDocument = do_QueryInterface(subDocument);
if (xulChildDocument == nsnull) {
NS_ERROR("Unable to retrieve a XUL child document.");
return rv;
}
nsCOMPtr<nsIDOMXULElement> xulElement;
xulElement = do_QueryInterface(aElement);
if (!xulElement) {
@ -646,15 +627,50 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
NS_ERROR("The fragment root doesn't have an RDF resource behind it.");
return rv;
}
xulChildDocument->SetFragmentRoot(rdfResource);
if (NS_FAILED(rv = subDocument->StartDocumentLoad(includeURL, container, getter_AddRefs(streamListener),
commandChars))) {
NS_ERROR("Unable to kick off XUL subdocument's document load.");
delete [] commandChars;
nsCOMPtr<nsIXULDocumentInfo> docInfo;
if (NS_FAILED(rv = nsComponentManager::CreateInstance(kXULDocumentInfoCID,
nsnull,
kIXULDocumentInfoIID,
(void**) getter_AddRefs(docInfo)))) {
NS_ERROR("unable to create document info object");
return rv;
}
if (NS_FAILED(rv = docInfo->Init(parentDoc, rdfResource))) {
NS_ERROR("unable to initialize doc info object.");
return rv;
}
nsCOMPtr<nsISupports> supportsInfo;
supportsInfo = do_QueryInterface(docInfo);
// Turn the content viewer into a webshell
nsCOMPtr<nsIWebShell> webshell;
webshell = do_QueryInterface(container);
if (webshell == nsnull) {
NS_ERROR("this isn't a webshell. we're in trouble.");
return rv;
}
nsCOMPtr<nsIDocumentLoader> docLoader;
if (NS_FAILED(rv = webshell->GetDocumentLoader(*getter_AddRefs(docLoader)))) {
NS_ERROR("unable to obtain the document loader to kick off the load.");
return rv;
}
char* commandChars = command.ToNewCString();
docLoader->LoadDocument(includeSrc,
commandChars,
container,
nsnull,
nsnull,
nsnull,
nsURLReload,
0);//,
//supportsInfo.get());
delete [] commandChars;
}

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

@ -877,7 +877,7 @@ XULDocumentImpl::StartDocumentLoad(nsIURL *aURL,
return rv;
}
// Create various data sources and builders, but only do this if we're
// Create the composite data source and builder, but only do this if we're
// not a XUL fragment.
if (mFragmentRoot == nsnull) {