← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/xulrunner-1.9/intrepid-security

« back to all changes in this revision

Viewing changes to mozilla/js/src/xpconnect/shell/xpcshell.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-02-14 16:55:40 UTC
  • mfrom: (1.2.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20100214165540-toqlunp37nl3dqic
Tags: 1.9.0.18+build1+nobinonly-0ubuntu0.8.10.1
* New upstream release v1.9.0.18 (FIREFOX_3_0_18_BUILD1)
  - see USN-895-1 

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/js/src/xpconnect/shell/xpcshell.cpp
916
916
 
917
917
class FullTrustSecMan
918
918
#ifndef XPCONNECT_STANDALONE
919
 
  : public nsIScriptSecurityManager_1_9_0_BRANCH
 
919
  : public nsIScriptSecurityManager_1_9_2
920
920
#else
921
921
  : public nsIXPCSecurityManager
922
922
#endif
927
927
#ifndef XPCONNECT_STANDALONE
928
928
  NS_DECL_NSISCRIPTSECURITYMANAGER
929
929
  NS_DECL_NSISCRIPTSECURITYMANAGER_1_9_0_BRANCH
 
930
  NS_DECL_NSISCRIPTSECURITYMANAGER_1_9_2
930
931
#endif
931
932
 
932
933
  FullTrustSecMan();
946
947
  NS_INTERFACE_MAP_ENTRY(nsIXPCSecurityManager)
947
948
#ifndef XPCONNECT_STANDALONE
948
949
  NS_INTERFACE_MAP_ENTRY(nsIScriptSecurityManager)
 
950
  NS_INTERFACE_MAP_ENTRY(nsIScriptSecurityManager_1_9_2)
949
951
#endif
950
952
  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXPCSecurityManager)
951
953
NS_INTERFACE_MAP_END
1078
1080
    return *_retval ? NS_OK : NS_ERROR_FAILURE;
1079
1081
}
1080
1082
 
 
1083
/* [noscript] void pushContextPrincipal (in JSContextPtr cx, in JSStackFramePtr fp, in nsIPrincipal principal); */
 
1084
NS_IMETHODIMP
 
1085
FullTrustSecMan::PushContextPrincipal(JSContext * cx, JSStackFrame * fp, nsIPrincipal *principal)
 
1086
{
 
1087
    return NS_OK;
 
1088
}
 
1089
 
 
1090
/* [noscript] void popContextPrincipal (in JSContextPtr cx); */
 
1091
NS_IMETHODIMP
 
1092
FullTrustSecMan::PopContextPrincipal(JSContext * cx)
 
1093
{
 
1094
    return NS_OK;
 
1095
}
 
1096
 
1081
1097
/* [noscript] nsIPrincipal getSystemPrincipal (); */
1082
1098
NS_IMETHODIMP
1083
1099
FullTrustSecMan::GetSystemPrincipal(nsIPrincipal **_retval)