Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XUL overlay work.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@39831 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com
1999-07-17 02:24:13 +00:00
parent b0d3e65928
commit 03459a1bee
2 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/rdf/base/src/nsRDFContainerUtils.cpp
View File

@@ -387,6 +387,16 @@ RDFContainerUtilsImpl::MakeContainer(nsIRDFDataSource* aDataSource, nsIRDFResour
return NS_ERROR_NULL_POINTER;
nsresult rv;
// Check to see if somebody has already turned it into a container; if so
// don't try to do it again.
PRBool isContainer;
rv = IsContainer(aDataSource, aResource, &isContainer);
if (NS_FAILED(rv)) return rv;
if (isContainer)
return NS_OK;
rv = aDataSource->Assert(aResource, kRDF_instanceOf, aType, PR_TRUE);
if (NS_FAILED(rv)) return rv;

52
mozilla/rdf/datasource/src/nsXULContentSink.cpp
View File

@@ -688,25 +688,25 @@ XULContentSinkImpl::CloseContainer(const nsIParserNode& aNode)
PRInt32 nestLevel = mContextStack->Count();
if (nestLevel == 0) {
mState = eXULContentSinkState_InEpilog;
// We're about to finish parsing. Now we want to kick off the processing
// of our child overlays.
PRInt32 count;
if (mOverlayArray && (count = mOverlayArray->Count())) {
nsString* href = (nsString*)mOverlayArray->ElementAt(0);
ProcessOverlay(*href);
// Block the parser. It will only be unblocked after all
// of our child overlays have finished parsing.
rv = NS_ERROR_HTMLPARSER_BLOCK;
}
// Unblock the next sibling overlay. If there is no next sibling
// overlay, unblock our parent.
if (mParentContentSink) {
mParentContentSink->UnblockNextOverlay();
}
mState = eXULContentSinkState_InEpilog;
// We're about to finish parsing. Now we want to kick off the processing
// of our child overlays.
PRInt32 count;
if (mOverlayArray && (count = mOverlayArray->Count())) {
nsString* href = (nsString*)mOverlayArray->ElementAt(0);
ProcessOverlay(*href);
// Block the parser. It will only be unblocked after all
// of our child overlays have finished parsing.
rv = NS_ERROR_HTMLPARSER_BLOCK;
}
// Unblock the next sibling overlay. If there is no next sibling
// overlay, unblock our parent.
if (mParentContentSink) {
mParentContentSink->UnblockNextOverlay();
}
}
PopNameSpaces();
@@ -1400,7 +1400,19 @@ XULContentSinkImpl::AddAttributes(const nsIParserNode& aNode,
rv = gRDFService->GetLiteral(valueStr.GetUnicode(), getter_AddRefs(value));
if (NS_FAILED(rv)) return rv;
rv = mDataSource->Assert(aSubject, property, value, PR_TRUE);
// XUL overlays may cause an old attribute to be over-ridden by
// a new value. So we check the graph to see if somebody has set
// the attribute already, and act appropriately.
nsCOMPtr<nsIRDFNode> oldvalue;
rv = mDataSource->GetTarget(aSubject, property, PR_TRUE, getter_AddRefs(oldvalue));
if (NS_FAILED(rv)) return rv;
if (oldvalue) {
rv = mDataSource->Change(aSubject, property, oldvalue, value);
}
else {
rv = mDataSource->Assert(aSubject, property, value, PR_TRUE);
}
if (NS_FAILED(rv)) return rv;
}
return NS_OK;