Bug 1005225: Follow up, changed uuid in the wrong idl (r=ckerschb)
☠☠ backed out by 28dfed913436 ☠ ☠
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Tue, 15 Jul 2014 13:59:59 -0700
changeset 216176 452d8502bea14bcf6e08db0585bde526349182e2
parent 216175 67373fe39c5386a619ac51a9305163674289abbb
child 216177 724724630cc956b57694906275ab7e13b44d5008
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersckerschb
bugs1005225
milestone33.0a1
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 1005225: Follow up, changed uuid in the wrong idl (r=ckerschb)
content/base/public/nsIContentPolicy.idl
content/base/public/nsIContentSecurityPolicy.idl
--- a/content/base/public/nsIContentPolicy.idl
+++ b/content/base/public/nsIContentPolicy.idl
@@ -19,17 +19,17 @@ typedef unsigned long nsContentPolicyTyp
  * Interface for content policy mechanism.  Implementations of this
  * interface can be used to control loading of various types of out-of-line
  * content, or processing of certain types of in-line content.
  *
  * WARNING: do not block the caller from shouldLoad or shouldProcess (e.g.,
  * by launching a dialog to prompt the user for something).
  */
 
-[scriptable,uuid(3e923bf6-a974-4f3b-91c4-b4fd48b37732)]
+[scriptable,uuid(b6a71698-c117-441d-86b9-480cf06e3952)]
 interface nsIContentPolicy : nsISupports
 {
   /**
    * Gecko/Firefox developers: Do not use TYPE_OTHER under any circumstances.
    *
    * Extension developers: Whenever it is reasonable, use one of the existing
    * content types. If none of the existing content types are right for
    * something you are doing, file a bug in the Core/DOM component that
--- a/content/base/public/nsIContentSecurityPolicy.idl
+++ b/content/base/public/nsIContentSecurityPolicy.idl
@@ -12,17 +12,17 @@ interface nsIPrincipal;
 
 /**
  * nsIContentSecurityPolicy
  * Describes an XPCOM component used to model and enforce CSPs.  Instances of
  * this class may have multiple policies within them, but there should only be
  * one of these per document/principal.
  */
 
-[scriptable, uuid(15c409c5-ebf8-457c-a8dd-5b169ca0b218)]
+[scriptable, uuid(3e923bf6-a974-4f3b-91c4-b4fd48b37732)]
 interface nsIContentSecurityPolicy : nsISerializable
 {
 
   /**
    * Set to true when the CSP has been read in and parsed and is ready to
    * enforce.  This is a barrier for the nsDocument so it doesn't load any
    * sub-content until either it knows that a CSP is ready or will not be used.
    */