Bug 242467 The patch for bug 242212 breaks builder.rebuild for remote XUL

patch by enndeakin@sympatico.ca r=jst sr=jst

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -203,9 +203,15 @@ nsXULTemplateBuilder::Init()
     return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS2(nsXULTemplateBuilder,
-                   nsIXULTemplateBuilder,
-                   nsIRDFObserver)
+NS_IMPL_ADDREF(nsXULTemplateBuilder)
+NS_IMPL_RELEASE(nsXULTemplateBuilder)
+
+NS_INTERFACE_MAP_BEGIN(nsXULTemplateBuilder)
+  NS_INTERFACE_MAP_ENTRY(nsIXULTemplateBuilder)
+  NS_INTERFACE_MAP_ENTRY(nsIRDFObserver)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULTemplateBuilder)
+  NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(XULTemplateBuilder)
+NS_INTERFACE_MAP_END
 
 //----------------------------------------------------------------------
 //

dom/public/nsIDOMClassInfo.h

@@ -225,6 +225,7 @@ enum nsDOMClassInfoID {
   eDOMClassInfo_ImageDocument_id,
 
 #ifdef MOZ_XUL
+  eDOMClassInfo_XULTemplateBuilder_id,
   eDOMClassInfo_XULTreeBuilder_id,
 #endif
 

dom/src/base/nsDOMClassInfo.cpp

@@ -796,6 +796,9 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            nsIXPCScriptable::WANT_ENUMERATE)
 
 #ifdef MOZ_XUL
+  NS_DEFINE_CLASSINFO_DATA(XULTemplateBuilder, nsDOMGenericSH,
+                           DEFAULT_SCRIPTABLE_FLAGS)
+
   NS_DEFINE_CLASSINFO_DATA(XULTreeBuilder, nsDOMGenericSH,
                            DEFAULT_SCRIPTABLE_FLAGS)
 #endif
@@ -2261,6 +2264,10 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_END_WITH_XPATH
 
 #ifdef MOZ_XUL
+  DOM_CLASSINFO_MAP_BEGIN(XULTemplateBuilder, nsIXULTemplateBuilder)
+    DOM_CLASSINFO_MAP_ENTRY(nsIXULTemplateBuilder)
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN(XULTreeBuilder, nsIXULTreeBuilder)
     DOM_CLASSINFO_MAP_ENTRY(nsIXULTreeBuilder)
     DOM_CLASSINFO_MAP_ENTRY(nsITreeView)