Allow C.u.Sandbox to take a principal or an nsIScriptObjectPrincipal. bug 353732, r+sr=jst

git-svn-id: svn://10.0.0.236/trunk@228094 18797224-902f-48f8-a5cc-f745e15eee43
2007-06-14 23:50:28 +00:00
parent 39911d1061
commit 8372f17aac
1 changed files with 6 additions and 2 deletions
--- a/mozilla/js/src/xpconnect/src/xpccomponents.cpp
+++ b/mozilla/js/src/xpconnect/src/xpccomponents.cpp
@@ -3309,8 +3309,12 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe

            if (wrapper) {
                sop = do_QueryWrappedNative(wrapper);
-
-                prinOrSop = sop;
+                if (sop) {
+                    prinOrSop = sop;
+                } else {
+                    principal = do_QueryWrappedNative(wrapper);
+                    prinOrSop = principal;
+                }
            }
        }