Bug 619800 - Enable scriptability for nsIPrincipal methods. r+sr+a=bz.
authorAsaf Romano <aromano@mozilla.com>
Wed, 22 Dec 2010 15:58:22 +0200
changeset 59600 1cb5ff9e32f63099adafaed2e0a34612577a0202
parent 59599 d37e24f10e8da251121c374cf7b88ac7ac9f098a
child 59601 d4215e592acac5f9e11d924cea4f5592ca581d91
push idunknown
push userunknown
push dateunknown
bugs619800
milestone2.0b9pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 619800 - Enable scriptability for nsIPrincipal methods. r+sr+a=bz.
caps/idl/nsIPrincipal.idl
--- a/caps/idl/nsIPrincipal.idl
+++ b/caps/idl/nsIPrincipal.idl
@@ -70,21 +70,19 @@ interface nsIPrincipal : nsISerializable
      * prefBranch will be set to the pref branch to which these preferences
      * pertain.  id is a pseudo-unique identifier, pertaining to either the
      * fingerprint or the origin.  subjectName is a name that identifies the
      * entity this principal represents (may be empty).  grantedList and
      * deniedList are space-separated lists of capabilities which were
      * explicitly granted or denied by a pref.  isTrusted is a boolean that
      * indicates whether this is a codebaseTrusted certificate.
      */
-    [noscript] void getPreferences(out string prefBranch, out string id,
-                                   out string subjectName,
-                                   out string grantedList,
-                                   out string deniedList,
-                                   out boolean isTrusted);
+    void getPreferences(out string prefBranch, out string id,
+                        out string subjectName, out string grantedList,
+                        out string deniedList, out boolean isTrusted);
 
     /**
      * Returns whether the other principal is equivalent to this principal.
      * Principals are considered equal if they are the same principal,
      * they have the same origin, or have the same certificate fingerprint ID
      */
     boolean equals(in nsIPrincipal other);
 
@@ -128,33 +126,33 @@ interface nsIPrincipal : nsISerializable
                                      inout voidPtr annotation);
     [noscript] void disableCapability(in string capability,
                                       inout voidPtr annotation);
 
     /**
      * The codebase URI to which this principal pertains.  This is
      * generally the document URI.
      */
-    [noscript] readonly attribute nsIURI URI;
+    readonly attribute nsIURI URI;
 
     /**
      * The domain URI to which this principal pertains.
      * This is congruent with HTMLDocument.domain, and may be null.
      * Setting this has no effect on the URI.
      */
     [noscript] attribute nsIURI domain;
 
     /**
      * The origin of this principal's codebase URI.
      * An origin is defined as: scheme + host + port.
      */
     // XXXcaa this should probably be turned into an nsIURI.
     // The system principal's origin should be some caps namespace
     // with a chrome URI.  All of chrome should probably be the same.
-    [noscript] readonly attribute string origin;
+    readonly attribute string origin;
 
     /**
      * Whether this principal is associated with a certificate.
      */
     readonly attribute boolean hasCertificate;
 
     /**
      * The fingerprint ID of this principal's certificate.
@@ -196,17 +194,17 @@ interface nsIPrincipal : nsISerializable
      *
      * XXXbz except see bug 147145!
      *
      * Note for the future: Perhaps we should consider a certificate principal
      * for a given URI subsuming a codebase principal for the same URI?  Not
      * sure what the immediate benefit would be, but I think the setup could
      * make some code (e.g. MaybeDowngradeToCodebase) clearer.
      */
-    [noscript] boolean subsumes(in nsIPrincipal other);
+    boolean subsumes(in nsIPrincipal other);
 
     /**
      * Checks whether this principal is allowed to load the network resource
      * located at the given URI under the same-origin policy. This means that
      * codebase principals are only allowed to load resources from the same
      * domain, the system principal is allowed to load anything, and null
      * principals are not allowed to load anything.
      *
@@ -219,17 +217,17 @@ interface nsIPrincipal : nsISerializable
      *       function.
      *
      *
      * @param uri    The URI about to be loaded.
      * @param report If true, will report a warning to the console service
      *               if the load is not allowed.
      * @throws NS_ERROR_DOM_BAD_URI if the load is not allowed.
      */
-    [noscript] void checkMayLoad(in nsIURI uri, in boolean report);
+    void checkMayLoad(in nsIURI uri, in boolean report);
 
     /**
      * The subject name for the certificate.  This actually identifies the
      * subject of the certificate.  This may well not be a string that would
      * mean much to a typical user on its own (e.g. it may have a number of
      * different names all concatenated together with some information on what
      * they mean in between).
      *