Adding new methods to domwindow to be able to set and get at XPConnect Objects based on an ID. This allows attaching an object from JS to the window and then retrieving and calling it from C++. This is just the specification for the interfaces. The implementation is not yet fully there.

dom/public/base/nsIDOMWindow.h

@@ -37,6 +37,7 @@ class nsIDOMHistory;
 class nsIDOMWindowCollection;
 class nsIDOMEvent;
 class nsISidebar;
+class nsISupports;
 class nsIDOMWindow;
 class nsIControllers;
 
@@ -199,6 +200,12 @@ public:
   NS_IMETHOD    Escape(const nsString& aStr, nsString& aReturn)=0;
 
   NS_IMETHOD    Unescape(const nsString& aStr, nsString& aReturn)=0;
+
+  NS_IMETHOD    AddXPConnectObject(const nsString& aId, nsISupports* aXPConnectObj)=0;
+
+  NS_IMETHOD    RemoveXPConnectObject(const nsString& aId, nsISupports* aXPConnectObj)=0;
+
+  NS_IMETHOD    GetXPConnectObject(const nsString& aId, nsISupports** aReturn)=0;
 };
 
 
@@ -285,6 +292,9 @@ public:
   NS_IMETHOD    UpdateCommands(const nsString& aAction);  \
   NS_IMETHOD    Escape(const nsString& aStr, nsString& aReturn);  \
   NS_IMETHOD    Unescape(const nsString& aStr, nsString& aReturn);  \
+  NS_IMETHOD    AddXPConnectObject(const nsString& aId, nsISupports* aXPConnectObj);  \
+  NS_IMETHOD    RemoveXPConnectObject(const nsString& aId, nsISupports* aXPConnectObj);  \
+  NS_IMETHOD    GetXPConnectObject(const nsString& aId, nsISupports** aReturn);  \
 
 
 
@@ -371,6 +381,9 @@ public:
   NS_IMETHOD    UpdateCommands(const nsString& aAction) { return _to UpdateCommands(aAction); }  \
   NS_IMETHOD    Escape(const nsString& aStr, nsString& aReturn) { return _to Escape(aStr, aReturn); }  \
   NS_IMETHOD    Unescape(const nsString& aStr, nsString& aReturn) { return _to Unescape(aStr, aReturn); }  \
+  NS_IMETHOD    AddXPConnectObject(const nsString& aId, nsISupports* aXPConnectObj) { return _to AddXPConnectObject(aId, aXPConnectObj); }  \
+  NS_IMETHOD    RemoveXPConnectObject(const nsString& aId, nsISupports* aXPConnectObj) { return _to RemoveXPConnectObject(aId, aXPConnectObj); }  \
+  NS_IMETHOD    GetXPConnectObject(const nsString& aId, nsISupports** aReturn) { return _to GetXPConnectObject(aId, aReturn); }  \
 
 
 extern nsresult NS_InitWindowClass(nsIScriptContext *aContext, nsIScriptGlobalObject *aGlobal);

dom/public/idl/base/Window.idl

@@ -78,6 +78,10 @@
 
 				DOMString escape(in DOMString str);
         DOMString unescape(in DOMString str);
+
+		  void addXPConnectObject(in DOMString id, in xpidl nsISupports XPConnectObj);
+		  void removeXPConnectObject(in DOMString id, in xpidl nsISupports XPConnectObj);
+		  xpidl nsISupports getXPConnectObject(in DOMString id);
       };
 
      interface EventTarget {

dom/public/nsDOMPropEnums.h

@@ -840,6 +840,7 @@ enum nsDOMProp {
     NS_DOM_PROP_UIEVENT_DETAIL, 
     NS_DOM_PROP_UIEVENT_INITUIEVENT, 
     NS_DOM_PROP_UIEVENT_VIEW, 
+    NS_DOM_PROP_WINDOW_ADDXPCONNECTOBJECT, 
     NS_DOM_PROP_WINDOW_ALERT, 
     NS_DOM_PROP_WINDOW_BACK, 
     NS_DOM_PROP_WINDOW_BLUR, 
@@ -863,6 +864,7 @@ enum nsDOMProp {
     NS_DOM_PROP_WINDOW_FORWARD, 
     NS_DOM_PROP_WINDOW_FRAMES, 
     NS_DOM_PROP_WINDOW_GETATTENTION,
+    NS_DOM_PROP_WINDOW_GETXPCONNECTOBJECT, 
     NS_DOM_PROP_WINDOW_HISTORY, 
     NS_DOM_PROP_WINDOW_HOME, 
     NS_DOM_PROP_WINDOW_INNERHEIGHT, 
@@ -885,6 +887,7 @@ enum nsDOMProp {
     NS_DOM_PROP_WINDOW_PRINT, 
     NS_DOM_PROP_WINDOW_PROMPT, 
     NS_DOM_PROP_WINDOW_RELEASEEVENTS, 
+    NS_DOM_PROP_WINDOW_REMOVEXPCONNECTOBJECT, 
     NS_DOM_PROP_WINDOW_RESIZEBY, 
     NS_DOM_PROP_WINDOW_RESIZETO, 
     NS_DOM_PROP_WINDOW_ROUTEEVENT, 

dom/public/nsDOMPropNames.h

@@ -839,6 +839,7 @@
     "uievent.detail", \
     "uievent.inituievent", \
     "uievent.view", \
+    "window.addxpconnectobject", \
     "window.alert", \
     "window.back", \
     "window.blur", \
@@ -862,6 +863,7 @@
     "window.forward", \
     "window.frames", \
     "window.getattention", \
+    "window.getxpconnectobject", \
     "window.history", \
     "window.home", \
     "window.innerheight", \
@@ -884,6 +886,7 @@
     "window.print", \
     "window.prompt", \
     "window.releaseevents", \
+    "window.removexpconnectobject", \
     "window.resizeby", \
     "window.resizeto", \
     "window.routeevent", \

dom/src/base/nsGlobalWindow.cpp

@@ -1766,6 +1766,30 @@ NS_IMETHODIMP GlobalWindowImpl::Unescape(const nsString& aStr, nsString& aReturn
    return NS_OK;
 }
 
+NS_IMETHODIMP GlobalWindowImpl::AddXPConnectObject(const nsString& aId, 
+   nsISupports* aXPConnectObj)
+{
+   // XXXTAB Implement me.
+   NS_ERROR("Not yet Implemented");
+   return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP GlobalWindowImpl::RemoveXPConnectObject(const nsString& aId,
+   nsISupports* aXPConnectObj)
+{
+   // XXXTAB Implement me.
+   NS_ERROR("Not yet Implemented");
+   return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP GlobalWindowImpl::GetXPConnectObject(const nsString& aId,
+   nsISupports** aXPConnectObj)
+{
+   // XXXTAB Implement me.
+   NS_ERROR("Not yet Implemented");
+   return NS_ERROR_FAILURE;
+}
+
 //*****************************************************************************
 // GlobalWindowImpl::nsIJSScriptObject
 //*****************************************************************************   

dom/src/base/nsJSWindow.cpp

@@ -45,6 +45,7 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMEventTarget.h"
 #include "nsISidebar.h"
+#include "nsISupports.h"
 #include "nsIDOMWindow.h"
 #include "nsIControllers.h"
 
@@ -63,6 +64,7 @@ static NS_DEFINE_IID(kIWindowCollectionIID, NS_IDOMWINDOWCOLLECTION_IID);
 static NS_DEFINE_IID(kIEventIID, NS_IDOMEVENT_IID);
 static NS_DEFINE_IID(kIEventTargetIID, NS_IDOMEVENTTARGET_IID);
 static NS_DEFINE_IID(kISidebarIID, NS_ISIDEBAR_IID);
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIWindowIID, NS_IDOMWINDOW_IID);
 static NS_DEFINE_IID(kIControllersIID, NS_ICONTROLLERS_IID);
 
@@ -2356,6 +2358,141 @@ WindowUnescape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
 }
 
 
+//
+// Native method AddXPConnectObject
+//
+PR_STATIC_CALLBACK(JSBool)
+WindowAddXPConnectObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMWindow *nativeThis = (nsIDOMWindow*)nsJSUtils::nsGetNativeThis(cx, obj);
+  nsresult result = NS_OK;
+  nsAutoString b0;
+  nsCOMPtr<nsISupports> b1;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  {
+    *rval = JSVAL_NULL;
+    nsIScriptSecurityManager *secMan = nsJSUtils::nsGetSecurityManager(cx, obj);
+    if (!secMan)
+        return PR_FALSE;
+    result = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ADDXPCONNECTOBJECT, PR_FALSE);
+    if (NS_FAILED(result)) {
+      return nsJSUtils::nsReportError(cx, obj, result);
+    }
+    if (argc < 2) {
+      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
+    }
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToXPCObject(getter_AddRefs(b1),
+                                           kISupportsIID, cx, argv[1])) {
+      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_XPC_OBJECT_ERR);
+    }
+
+    result = nativeThis->AddXPConnectObject(b0, b1);
+    if (NS_FAILED(result)) {
+      return nsJSUtils::nsReportError(cx, obj, result);
+    }
+
+    *rval = JSVAL_VOID;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method RemoveXPConnectObject
+//
+PR_STATIC_CALLBACK(JSBool)
+WindowRemoveXPConnectObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMWindow *nativeThis = (nsIDOMWindow*)nsJSUtils::nsGetNativeThis(cx, obj);
+  nsresult result = NS_OK;
+  nsAutoString b0;
+  nsCOMPtr<nsISupports> b1;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  {
+    *rval = JSVAL_NULL;
+    nsIScriptSecurityManager *secMan = nsJSUtils::nsGetSecurityManager(cx, obj);
+    if (!secMan)
+        return PR_FALSE;
+    result = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_REMOVEXPCONNECTOBJECT, PR_FALSE);
+    if (NS_FAILED(result)) {
+      return nsJSUtils::nsReportError(cx, obj, result);
+    }
+    if (argc < 2) {
+      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
+    }
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToXPCObject(getter_AddRefs(b1),
+                                           kISupportsIID, cx, argv[1])) {
+      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_XPC_OBJECT_ERR);
+    }
+
+    result = nativeThis->RemoveXPConnectObject(b0, b1);
+    if (NS_FAILED(result)) {
+      return nsJSUtils::nsReportError(cx, obj, result);
+    }
+
+    *rval = JSVAL_VOID;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method GetXPConnectObject
+//
+PR_STATIC_CALLBACK(JSBool)
+WindowGetXPConnectObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMWindow *nativeThis = (nsIDOMWindow*)nsJSUtils::nsGetNativeThis(cx, obj);
+  nsresult result = NS_OK;
+  nsISupports* nativeRet;
+  nsAutoString b0;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  {
+    *rval = JSVAL_NULL;
+    nsIScriptSecurityManager *secMan = nsJSUtils::nsGetSecurityManager(cx, obj);
+    if (!secMan)
+        return PR_FALSE;
+    result = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_GETXPCONNECTOBJECT, PR_FALSE);
+    if (NS_FAILED(result)) {
+      return nsJSUtils::nsReportError(cx, obj, result);
+    }
+    if (argc < 1) {
+      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
+    }
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    result = nativeThis->GetXPConnectObject(b0, &nativeRet);
+    if (NS_FAILED(result)) {
+      return nsJSUtils::nsReportError(cx, obj, result);
+    }
+
+    // n.b., this will release nativeRet
+    nsJSUtils::nsConvertXPCObjectToJSVal(nativeRet, NS_GET_IID(nsISupports), cx, obj, rval);
+  }
+
+  return JS_TRUE;
+}
+
+
 //
 // Native method AddEventListener
 //
@@ -2573,6 +2710,9 @@ static JSFunctionSpec WindowMethods[] =
   {"updateCommands",          WindowUpdateCommands,     1},
   {"escape",          WindowEscape,     1},
   {"unescape",          WindowUnescape,     1},
+  {"addXPConnectObject",          WindowAddXPConnectObject,     2},
+  {"removeXPConnectObject",          WindowRemoveXPConnectObject,     2},
+  {"getXPConnectObject",          WindowGetXPConnectObject,     1},
   {"addEventListener",          EventTargetAddEventListener,     3},
   {"removeEventListener",          EventTargetRemoveEventListener,     3},
   {0}