b=235665, aggregation broken in bookmarks [gecko only bits], r=axel,shaver,others,sr=shaver

Author: vladimir%pobox.com

content/shared/public/nsXULAtomList.h

@@ -309,3 +309,4 @@ XUL_ATOM(hidechrome, "hidechrome")
 XUL_ATOM(popupset, "popupset")
 XUL_ATOM(parsetype, "parsetype")
 XUL_ATOM(canvas, "canvas")
+XUL_ATOM(infer, "infer")

content/xul/templates/src/nsXULContentBuilder.cpp

@@ -802,7 +802,7 @@ nsXULContentBuilder::BuildContentFromTemplate(nsIContent *aTemplateNode,
                 rv = NS_ERROR_UNEXPECTED;
 
                 if (gXULSortService && isResourceElement) {
-                    rv = gXULSortService->InsertContainerNode(mDB, &sortState,
+                    rv = gXULSortService->InsertContainerNode(mCompDB, &sortState,
                                                               mRoot, aResourceNode,
                                                               aRealNode, realKid,
                                                               aNotify);

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -77,6 +77,7 @@
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
 #include "nsIRDFCompositeDataSource.h"
+#include "nsIRDFInferDataSource.h"
 #include "nsIRDFContainerUtils.h" 
 #include "nsIXULDocument.h"
 #include "nsIXULTemplateBuilder.h"
@@ -149,6 +150,7 @@ PRLogModuleInfo* gXULTemplateLog;
 
 nsXULTemplateBuilder::nsXULTemplateBuilder(void)
     : mDB(nsnull),
+      mCompDB(nsnull),
       mRoot(nsnull),
       mUpdateBatchNest(0),
       mRulesCompiled(PR_FALSE),
@@ -220,7 +222,7 @@ nsXULTemplateBuilder::GetRoot(nsIDOMElement** aResult)
 NS_IMETHODIMP
 nsXULTemplateBuilder::GetDatabase(nsIRDFCompositeDataSource** aResult)
 {
-    NS_IF_ADDREF(*aResult = mDB.get());
+    NS_IF_ADDREF(*aResult = mCompDB.get());
     return NS_OK;
 }
 
@@ -248,7 +250,7 @@ nsXULTemplateBuilder::Refresh()
     nsresult rv;
 
     nsCOMPtr<nsISimpleEnumerator> dslist;
-    rv = mDB->GetDataSources(getter_AddRefs(dslist));
+    rv = mCompDB->GetDataSources(getter_AddRefs(dslist));
     NS_ENSURE_SUCCESS(rv, rv);
 
     PRBool hasMore;
@@ -350,6 +352,7 @@ nsXULTemplateBuilder::DocumentWillBeDestroyed(nsIDocument *aDocument)
     if (mDB) {
         mDB->RemoveObserver(this);
         mDB = nsnull;
+        mCompDB = nsnull;
     }
 
     mRoot = nsnull;
@@ -668,12 +671,15 @@ nsXULTemplateBuilder::LoadDataSources(nsIDocument* doc)
 
     if (mDB) {
         mDB->RemoveObserver(this);
+
+        // we'll set it again later, after we create a new composite ds
+        mDB = nsnull;
     }
 
     // create a database for the builder
-    mDB = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "composite-datasource");
+    mCompDB = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "composite-datasource");
 
-    if (! mDB) {
+    if (! mCompDB) {
         NS_ERROR("unable to construct new composite data source");
         return NS_ERROR_UNEXPECTED;
     }
@@ -682,12 +688,12 @@ nsXULTemplateBuilder::LoadDataSources(nsIDocument* doc)
 	nsAutoString coalesce;
 	mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::coalesceduplicatearcs, coalesce);
     if (coalesce.EqualsLiteral("false"))
-		mDB->SetCoalesceDuplicateArcs(PR_FALSE);
+		mCompDB->SetCoalesceDuplicateArcs(PR_FALSE);
 
     nsAutoString allowneg;
     mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::allownegativeassertions, allowneg);
     if (allowneg.EqualsLiteral("false"))
-		mDB->SetAllowNegativeAssertions(PR_FALSE);
+		mCompDB->SetAllowNegativeAssertions(PR_FALSE);
 
     // Grab the doc's principal...
     nsIPrincipal *docPrincipal = doc->GetPrincipal();
@@ -706,7 +712,7 @@ nsXULTemplateBuilder::LoadDataSources(nsIDocument* doc)
         nsCOMPtr<nsIRDFDataSource> localstore;
         rv = gRDFService->GetDataSource("rdf:local-store", getter_AddRefs(localstore));
         if (NS_SUCCEEDED(rv)) {
-            rv = mDB->AddDataSource(localstore);
+            rv = mCompDB->AddDataSource(localstore);
             NS_ASSERTION(NS_SUCCEEDED(rv), "unable to add local store to db");
             if (NS_FAILED(rv)) return rv;
         }
@@ -793,9 +799,28 @@ nsXULTemplateBuilder::LoadDataSources(nsIDocument* doc)
             continue;
         }
 
-        mDB->AddDataSource(ds);
+        mCompDB->AddDataSource(ds);
     }
 
+    // check if we were given an inference engine type
+    nsAutoString infer;
+    mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::infer, infer);
+    if (!infer.IsEmpty()) {
+        nsCString inferContractID(NS_RDF_INFER_DATASOURCE_CONTRACTID_PREFIX);
+        AppendUTF16toUTF8(infer, inferContractID);
+        nsCOMPtr<nsIRDFInferDataSource> inferDB = do_CreateInstance(inferContractID.get());
+
+        if (inferDB) {
+            inferDB->SetBaseDataSource(mCompDB);
+            mDB = do_QueryInterface(inferDB);
+        } else {
+            NS_WARNING("failed to construct inference engine specified on template");
+        }
+    }
+
+    if (!mDB)
+        mDB = mCompDB;
+
     nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
     if (xuldoc)
         xuldoc->SetTemplateBuilderFor(mRoot, this);

content/xul/templates/src/nsXULTemplateBuilder.h

@@ -301,7 +301,8 @@ class nsXULTemplateBuilder : public nsIXULTemplateBuilder,
 protected:
     // We are an observer of the composite datasource. The cycle is
     // broken when the document is destroyed.
-    nsCOMPtr<nsIRDFCompositeDataSource> mDB;
+    nsCOMPtr<nsIRDFDataSource> mDB;
+    nsCOMPtr<nsIRDFCompositeDataSource> mCompDB;
 
     // Circular reference, broken when the document is destroyed.
     nsCOMPtr<nsIContent> mRoot;

rdf/base/idl/Makefile.in

@@ -64,6 +64,7 @@ XPIDLSRCS	= \
 		nsIRDFXMLSerializer.idl \
 		nsIRDFXMLSink.idl \
 		nsIRDFXMLSource.idl \
+		nsIRDFInferDataSource.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

rdf/base/idl/nsIRDFInferDataSource.idl

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *   Vladimir Vukicevic <vladimir@pobox.com>
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIRDFDataSource.idl"
+
+/**
+ * An nsIRDFInferDataSource is implemented by a infer engine. This
+ * engine mimics assertions in addition to those in the baseDataSource
+ * according to a particular vocabulary.
+ * Infer engines have contract IDs in the form of
+ * "@mozilla.org/rdf/infer-datasource;1?engine="
+ */
+
+[scriptable, uuid(2b04860f-4017-40f6-8a57-784a1e35077a)]
+interface nsIRDFInferDataSource : nsIRDFDataSource {
+    /**
+     *
+     * The wrapped datasource.
+     *
+     * The InferDataSource contains all arcs from the wrapped
+     * datasource plus those infered by the vocabulary implemented
+     * by the InferDataSource.
+     */
+    attribute nsIRDFDataSource baseDataSource;
+};
+

rdf/base/public/rdf.h

@@ -70,7 +70,7 @@ static const char kURI##prefix##_##name[] = ns #name
 #define RDF_NAMESPACE_URI  "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 #define WEB_NAMESPACE_URI  "http://home.netscape.com/WEB-rdf#"
 #define NC_NAMESPACE_URI   "http://home.netscape.com/NC-rdf#"
-
+#define DEVMO_NAMESPACE_URI_PREFIX "http://developer.mozilla.org/rdf/vocabulary/"
 
 /**
  * @name Standard RDF error codes
@@ -103,6 +103,7 @@ static const char kURI##prefix##_##name[] = ns #name
 #define NS_RDF_DATASOURCE_CONTRACTID_PREFIX         NS_RDF_DATASOURCE_CONTRACTID "?name="
 #define NS_RDF_RESOURCE_FACTORY_CONTRACTID          "@mozilla.org/rdf/resource-factory;1"
 #define NS_RDF_RESOURCE_FACTORY_CONTRACTID_PREFIX   NS_RDF_RESOURCE_FACTORY_CONTRACTID "?name="
+#define NS_RDF_INFER_DATASOURCE_CONTRACTID_PREFIX   NS_RDF_CONTRACTID "/infer-datasource;1?engine="
 
 // contract ID is in the form
 // @mozilla.org/rdf/delegate-factory;1?key=<key>&scheme=<scheme>

xpcom/ds/nsEnumeratorUtils.cpp

@@ -164,4 +164,90 @@ NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
 
 ////////////////////////////////////////////////////////////////////////////////
 
+nsUnionEnumerator::nsUnionEnumerator(nsISimpleEnumerator* firstEnumerator,
+                                     nsISimpleEnumerator* secondEnumerator)
+    : mFirstEnumerator(firstEnumerator),
+      mSecondEnumerator(secondEnumerator),
+      mConsumed(PR_FALSE), mAtSecond(PR_FALSE)
+{
+}
+
+nsUnionEnumerator::~nsUnionEnumerator()
+{
+}
+
+NS_IMPL_ISUPPORTS1(nsUnionEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsUnionEnumerator::HasMoreElements(PRBool* aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    nsresult rv;
+
+    if (mConsumed) {
+        *aResult = PR_FALSE;
+        return NS_OK;
+    }
+
+    if (! mAtSecond) {
+        rv = mFirstEnumerator->HasMoreElements(aResult);
+        if (NS_FAILED(rv)) return rv;
+
+        if (*aResult)
+            return NS_OK;
+
+        mAtSecond = PR_TRUE;
+    }
+
+    rv = mSecondEnumerator->HasMoreElements(aResult);
+    if (NS_FAILED(rv)) return rv;
+
+    if (*aResult)
+        return NS_OK;
 
+    *aResult = PR_FALSE;
+    mConsumed = PR_TRUE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUnionEnumerator::GetNext(nsISupports** aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (mConsumed)
+        return NS_ERROR_UNEXPECTED;
+
+    if (! mAtSecond)
+        return mFirstEnumerator->GetNext(aResult);
+
+    return mSecondEnumerator->GetNext(aResult);
+}
+
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsISimpleEnumerator* *result,
+                      nsISimpleEnumerator* firstEnumerator,
+                      nsISimpleEnumerator* secondEnumerator)
+{
+    *result = nsnull;
+    if (! firstEnumerator) {
+        *result = secondEnumerator;
+    } else if (! secondEnumerator) {
+        *result = firstEnumerator;
+    } else {
+        nsUnionEnumerator* enumer = new nsUnionEnumerator(firstEnumerator, secondEnumerator);
+        if (enumer == nsnull)
+            return NS_ERROR_OUT_OF_MEMORY;
+        *result = enumer; 
+    }
+    NS_ADDREF(*result);
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////

xpcom/ds/nsEnumeratorUtils.h

@@ -93,4 +93,32 @@ NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
 
 ////////////////////////////////////////////////////////////////////////
 
+class NS_COM nsUnionEnumerator : public nsISimpleEnumerator
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator methods
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    nsUnionEnumerator(nsISimpleEnumerator* firstEnumerator,
+                      nsISimpleEnumerator* secondEnumerator);
+
+private:
+    ~nsUnionEnumerator();
+
+protected:
+    nsCOMPtr<nsISimpleEnumerator> mFirstEnumerator, mSecondEnumerator;
+    PRBool mConsumed;
+    PRBool mAtSecond;
+};
+
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsISimpleEnumerator* *result,
+                      nsISimpleEnumerator* firstEnumerator,
+                      nsISimpleEnumerator* secondEnumerator);
+
+////////////////////////////////////////////////////////////////////////
+
 #endif /* nsEnumeratorUtils_h__ */