XUL fragments live!

content/xul/document/src/nsXULDocument.cpp

@@ -975,10 +975,7 @@ XULDocumentImpl::StartDocumentLoad(nsIURL *aURL,
     }
 
     {
-        nsCOMPtr<nsIWebShell> webShell;
-        aContainer->QueryInterface(kIWebShellIID, getter_AddRefs(webShell));
-
-        if (NS_FAILED(rv = sink->Init(this, webShell, mDocumentDataSource))) {
+        if (NS_FAILED(rv = sink->Init(this, mDocumentDataSource))) {
             NS_ERROR("Unable to initialize XUL content sink");
             return rv;
         }

rdf/content/src/nsRDFXULBuilder.cpp

@@ -301,7 +301,7 @@ RDFXULBuilderImpl::RDFXULBuilderImpl(void)
 
         kContainerAtom            = NS_NewAtom("container");
         kXULContentsGeneratedAtom = NS_NewAtom("xulcontentsgenerated");
-        kXULIncludeSrcAtom        = NS_NewAtom("includesrc");
+        kXULIncludeSrcAtom        = NS_NewAtom("foopy");
         kIdAtom                   = NS_NewAtom("id");
         kDataSourcesAtom          = NS_NewAtom("datasources");
         kTreeAtom                 = NS_NewAtom("tree");
@@ -642,9 +642,6 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
             return rv;
         }
         
-        nsCOMPtr<nsISupports> supportsInfo;
-        supportsInfo = do_QueryInterface(docInfo);
-
         // Turn the content viewer into a webshell
         nsCOMPtr<nsIWebShell> webshell;
         webshell = do_QueryInterface(container);
@@ -659,19 +656,8 @@ RDFXULBuilderImpl::CreateContents(nsIContent* aElement)
             return rv;
         }
 
-        char* commandChars = command.ToNewCString();
-
-        docLoader->LoadDocument(includeSrc,
-                                commandChars,
-                                container,
-                                nsnull,
-                                nsnull,
-                                nsnull,
-                                nsURLReload,
-                                0);//,
-                                //supportsInfo.get());
-
-        delete [] commandChars;
+        docLoader->LoadSubDocument(includeSrc,
+                                   docInfo.get());
     }
 
     return rv;

rdf/content/src/nsXULDocument.cpp

@@ -975,10 +975,7 @@ XULDocumentImpl::StartDocumentLoad(nsIURL *aURL,
     }
 
     {
-        nsCOMPtr<nsIWebShell> webShell;
-        aContainer->QueryInterface(kIWebShellIID, getter_AddRefs(webShell));
-
-        if (NS_FAILED(rv = sink->Init(this, webShell, mDocumentDataSource))) {
+        if (NS_FAILED(rv = sink->Init(this, mDocumentDataSource))) {
             NS_ERROR("Unable to initialize XUL content sink");
             return rv;
         }

rdf/content/src/nsXULDocumentInfo.cpp

@@ -75,8 +75,8 @@ XULDocumentInfoImpl::~XULDocumentInfoImpl(void)
 
 nsresult
 XULDocumentInfoImpl::Init(nsIDocument* aDocument, nsIRDFResource* aResource) {
-  NS_IF_RELEASE(aDocument);
-  NS_IF_RELEASE(aResource);
+  NS_IF_RELEASE(mParentDocument);
+  NS_IF_RELEASE(mFragmentRoot);
 
   mParentDocument = aDocument;
   mFragmentRoot = aResource;