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

Tweaks related to XUL fragments.

Browse Source
This commit is contained in:
hyatt%netscape.com 1999-03-10 23:31:26 +00:00
parent 1f0706e2d1
commit b2fa4f5976
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -641,7 +641,7 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
}
nsCOMPtr<nsIRDFResource> rdfResource;
//xulElement->GetResource(rdfResource);
xulElement->GetResource(getter_AddRefs(rdfResource));
if (!rdfResource) {
NS_ERROR("The fragment root doesn't have an RDF resource behind it.");
return rv;

78
rdf/datasource/src/nsXULContentSink.cpp
View File

@ -849,46 +849,42 @@ XULContentSinkImpl::Init(nsIDocument* aDocument, nsIWebShell* aWebShell, nsIRDFD
return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIXULChildDocument> childDocument;
childDocument = do_QueryInterface(mDocument);
if (childDocument != nsnull) {
childDocument->GetFragmentRoot(&mFragmentRoot);
NS_PRECONDITION(mFragmentRoot, "must have a fragment root to place the fragment properly");
if (mFragmentRoot) {
// We're totally a subdocument. Find the root document's
// data source and make assertions there.
// First of all, find the root document.
nsIDocument* rootDocument;
nsIDocument* currDocument;
currDocument = aDocument;
NS_ADDREF(currDocument);
while (currDocument != nsnull) {
NS_IF_RELEASE(rootDocument);
rootDocument = currDocument;
currDocument = rootDocument->GetParentDocument();
}
childDocument = do_QueryInterface(aDocument);
childDocument->GetFragmentRoot(&mFragmentRoot);
if (mFragmentRoot) {
// We're totally a subdocument. Find the root document's
// data source and make assertions there.
// First of all, find the root document.
nsIDocument* rootDocument = nsnull;
nsIDocument* currDocument;
currDocument = aDocument;
NS_ADDREF(currDocument);
while (currDocument != nsnull) {
NS_IF_RELEASE(rootDocument);
rootDocument = currDocument;
currDocument = rootDocument->GetParentDocument();
}
// Retrieve the root data source.
nsCOMPtr<nsIRDFDocument> rdfRootDoc;
rdfRootDoc = do_QueryInterface(rootDocument);
if (rdfRootDoc == nsnull) {
NS_ERROR("Root document of a XUL fragment is not an RDF doc.");
NS_RELEASE(rootDocument);
return rv;
}
// Retrieve the root data source.
nsCOMPtr<nsIRDFDocument> rdfRootDoc;
rdfRootDoc = do_QueryInterface(rootDocument);
if (rdfRootDoc == nsnull) {
NS_ERROR("Root document of a XUL fragment is not an RDF doc.");
NS_RELEASE(rootDocument);
return rv;
}
nsCOMPtr<nsIRDFDataSource> docDataSource;
if (NS_FAILED(rv = rdfRootDoc->GetDocumentDataSource(getter_AddRefs(docDataSource)))) {
NS_ERROR("Unable to retrieve an RDF document's data source.");
NS_RELEASE(rootDocument);
return rv;
}
NS_IF_RELEASE(mDataSource);
mDataSource = docDataSource.get();
NS_ADDREF(mDataSource);
}
else return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIRDFDataSource> docDataSource;
if (NS_FAILED(rv = rdfRootDoc->GetDocumentDataSource(getter_AddRefs(docDataSource)))) {
NS_ERROR("Unable to retrieve an RDF document's data source.");
NS_RELEASE(rootDocument);
return rv;
}
NS_IF_RELEASE(mDataSource);
mDataSource = docDataSource.get();
NS_ADDREF(mDataSource);
}
else {
@ -914,8 +910,9 @@ XULContentSinkImpl::Init(nsIDocument* aDocument, nsIWebShell* aWebShell, nsIRDFD
return rv;
}
if (mFragmentRoot) {
if (mFragmentRoot == nsnull) {
// XUL Namespace isn't registered if we're a root document.
// We need to register it.
rv = mNameSpaceManager->RegisterNameSpace(kXULNameSpaceURI, kNameSpaceID_XUL);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to register XUL namespace");
}
@ -1133,9 +1130,8 @@ XULContentSinkImpl::OpenTag(const nsIParserNode& aNode)
SplitQualifiedName(aNode.GetText(), nameSpaceID, tag);
// HTML tags all need to be upper-cased
// HTML tags must be lowercase
if (nameSpaceID == kNameSpaceID_HTML) {
tag.ToLowerCase();
if (tag.Equals("script")) {
return OpenScript(aNode);
}