diff -r 000000000000 -r 6474c204b198 content/xul/templates/src/nsXULTemplateQueryProcessorXML.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsXULTemplateQueryProcessorXML_h__
+#define nsXULTemplateQueryProcessorXML_h__
+
+#include "nsIXULTemplateBuilder.h"
+#include "nsIXULTemplateQueryProcessor.h"
+
+#include "nsISimpleEnumerator.h"
+#include "nsString.h"
+#include "nsCOMArray.h"
+#include "nsRefPtrHashtable.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMEventListener.h"
+#include "nsIDOMXPathExpression.h"
+#include "nsIDOMXPathEvaluator.h"
+#include "nsIDOMXPathResult.h"
+#include "nsXMLBinding.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIXMLHttpRequest.h"
+#include "mozilla/Attributes.h"
+
+class nsXULTemplateQueryProcessorXML;
+
+#define NS_IXMLQUERY_IID \
+  {0x0358d692, 0xccce, 0x4a97, \
+    { 0xb2, 0x51, 0xba, 0x8f, 0x17, 0x0f, 0x3b, 0x6f }}
+ 
+class nsXMLQuery MOZ_FINAL : public nsISupports
+{
+  public:
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXMLQUERY_IID)
+
+    NS_DECL_ISUPPORTS
+
+    // return a weak reference to the processor the query was created from
+    nsXULTemplateQueryProcessorXML* Processor() { return mProcessor; }
+
+    // return a weak reference t the member variable for the query
+    nsIAtom* GetMemberVariable() { return mMemberVariable; }
+
+    // return a weak reference to the expression used to generate results
+    nsIDOMXPathExpression* GetResultsExpression() { return mResultsExpr; }
+
+    // return a weak reference to the additional required bindings
+    nsXMLBindingSet* GetBindingSet() { return mRequiredBindings; }
+
+    // add a required binding for the query
+    nsresult
+    AddBinding(nsIAtom* aVar, nsIDOMXPathExpression* aExpr)
+    {
+        if (!mRequiredBindings) {
+            mRequiredBindings = new nsXMLBindingSet();
+            NS_ENSURE_TRUE(mRequiredBindings, NS_ERROR_OUT_OF_MEMORY);
+        }
+
+        return mRequiredBindings->AddBinding(aVar, aExpr);
+    }
+
+    nsXMLQuery(nsXULTemplateQueryProcessorXML* aProcessor,
+                        nsIAtom* aMemberVariable,
+                        nsIDOMXPathExpression* aResultsExpr)
+        : mProcessor(aProcessor),
+          mMemberVariable(aMemberVariable),
+          mResultsExpr(aResultsExpr)
+    { }
+
+  protected:
+    nsXULTemplateQueryProcessorXML* mProcessor;
+
+    nsCOMPtr<nsIAtom> mMemberVariable;
+
+    nsCOMPtr<nsIDOMXPathExpression> mResultsExpr;
+
+    nsRefPtr<nsXMLBindingSet> mRequiredBindings;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsXMLQuery, NS_IXMLQUERY_IID)
+
+class nsXULTemplateResultSetXML MOZ_FINAL : public nsISimpleEnumerator
+{
+private:
+
+    // reference back to the query
+    nsCOMPtr<nsXMLQuery> mQuery;
+
+    // the binding set created from <assign> nodes
+    nsRefPtr<nsXMLBindingSet> mBindingSet;
+
+    // set of results contained in this enumerator
+    nsCOMPtr<nsIDOMXPathResult> mResults;
+
+    // current position within the list of results
+    uint32_t mPosition;
+
+public:
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator interface
+    NS_DECL_NSISIMPLEENUMERATOR
+
+    nsXULTemplateResultSetXML(nsXMLQuery* aQuery,
+                              nsIDOMXPathResult* aResults,
+                              nsXMLBindingSet* aBindingSet)
+        : mQuery(aQuery),
+          mBindingSet(aBindingSet),
+          mResults(aResults),
+          mPosition(0)
+    {}
+};
+
+class nsXULTemplateQueryProcessorXML MOZ_FINAL : public nsIXULTemplateQueryProcessor,
+                                                 public nsIDOMEventListener
+{
+public:
+
+    nsXULTemplateQueryProcessorXML()
+        : mGenerationStarted(false)
+    {}
+
+    // nsISupports interface
+    NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+    NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXULTemplateQueryProcessorXML,
+                                             nsIXULTemplateQueryProcessor)
+
+    // nsIXULTemplateQueryProcessor interface
+    NS_DECL_NSIXULTEMPLATEQUERYPROCESSOR
+
+    // nsIDOMEventListener interface
+    NS_DECL_NSIDOMEVENTLISTENER
+
+    nsXMLBindingSet*
+    GetOptionalBindingsForRule(nsIDOMNode* aRuleNode);
+
+    // create an XPath expression from aExpr, using aNode for
+    // resolving namespaces
+    nsresult
+    CreateExpression(const nsAString& aExpr,
+                     nsIDOMNode* aNode,
+                     nsIDOMXPathExpression** aCompiledExpr);
+
+private:
+
+    bool mGenerationStarted;
+
+    nsRefPtrHashtable<nsISupportsHashKey, nsXMLBindingSet> mRuleToBindingsMap;
+
+    nsCOMPtr<nsIDOMElement> mRoot;
+
+    nsCOMPtr<nsIDOMXPathEvaluator> mEvaluator;
+
+    nsCOMPtr<nsIXULTemplateBuilder> mTemplateBuilder;
+
+    nsCOMPtr<nsIXMLHttpRequest> mRequest;
+};
+
+
+#endif // nsXULTemplateQueryProcessorXML_h__