Fix for bug 202393. Add DOM class info for nsIXULTreeBuilder.

r=pike, sr=peterv

content/xul/templates/src/nsXULTreeBuilder.cpp

@@ -70,6 +70,7 @@
 #include "nsVoidArray.h"
 #include "nsUnicharUtils.h"
 #include "nsINameSpaceManager.h"
+#include "nsIDOMClassInfo.h"
 
 // For security check
 #include "nsIDocument.h"
@@ -308,9 +309,16 @@ NS_NewXULTreeBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult)
     return rv;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED2(nsXULTreeBuilder, nsXULTemplateBuilder,
-                             nsIXULTreeBuilder,
-                             nsITreeView)
+NS_IMPL_ADDREF(nsXULTreeBuilder)
+NS_IMPL_RELEASE(nsXULTreeBuilder)
+
+NS_INTERFACE_MAP_BEGIN(nsXULTreeBuilder)
+  NS_INTERFACE_MAP_ENTRY(nsIXULTreeBuilder)
+  NS_INTERFACE_MAP_ENTRY(nsITreeView)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULTreeBuilder)
+  NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(XULTreeBuilder)
+NS_INTERFACE_MAP_END_INHERITING(nsXULTemplateBuilder)
+
 
 nsXULTreeBuilder::nsXULTreeBuilder()
     : mSortVariable(0),

dom/public/nsIDOMClassInfo.h

@@ -270,6 +270,10 @@ enum nsDOMClassInfoID {
   
   eDOMClassInfo_ImageDocument_id,
 
+#ifdef MOZ_XUL
+  eDOMClassInfo_XULTreeBuilder_id,
+#endif
+
   // This one better be the last one in this list
   eDOMClassInfoIDCount
 };

dom/src/base/Makefile.in

@@ -61,6 +61,8 @@ REQUIRES	= xpcom \
 		  appshell \
 		  intl \
 		  unicharutil \
+		  rdf \
+		  xultmpl \
 		  $(NULL)
 
 ifdef NS_TRACE_MALLOC

dom/src/base/nsDOMClassInfo.cpp

@@ -282,6 +282,7 @@
 #include "nsITreeSelection.h"
 #include "nsITreeContentView.h"
 #include "nsITreeView.h"
+#include "nsIXULTemplateBuilder.h"
 #endif
 #include "nsIDOMXPathEvaluator.h"
 
@@ -822,6 +823,10 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOCUMENT_SCRIPTABLE_FLAGS |
                            nsIXPCScriptable::WANT_ENUMERATE)
 
+#ifdef MOZ_XUL
+  NS_DEFINE_CLASSINFO_DATA(XULTreeBuilder, nsDOMGenericSH,
+                           DEFAULT_SCRIPTABLE_FLAGS)
+#endif
 };
 
 nsIXPConnect *nsDOMClassInfo::sXPConnect = nsnull;
@@ -2224,6 +2229,13 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Node)
   DOM_CLASSINFO_MAP_END
 
+#ifdef MOZ_XUL
+  DOM_CLASSINFO_MAP_BEGIN(XULTreeBuilder, nsIXULTreeBuilder)
+    DOM_CLASSINFO_MAP_ENTRY(nsIXULTreeBuilder)
+    DOM_CLASSINFO_MAP_ENTRY(nsITreeView)
+  DOM_CLASSINFO_MAP_END
+#endif
+
 #ifdef NS_DEBUG
   {
     PRUint32 i = sizeof(sClassInfoData) / sizeof(sClassInfoData[0]);