Backout of changes inadverently checked in with previous commit for bug 910899
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Mon, 09 Sep 2013 19:27:44 +0100
changeset 159171 6bfbf7c7160eb9dabdec4013a36c9cd89029ebc1
parent 159170 ebebb890be3b87dfe0e7c977e3b42614be464964
child 159172 2fce3bcfb3c83e922f652175daa8ec0f292a8738
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs910899
milestone26.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
Backout of changes inadverently checked in with previous commit for bug 910899
dom/interfaces/base/nsIContentPrefService2.idl
--- a/dom/interfaces/base/nsIContentPrefService2.idl
+++ b/dom/interfaces/base/nsIContentPrefService2.idl
@@ -62,17 +62,17 @@ interface nsIContentPref;
  * The methods of callback objects are always called asynchronously.
  *
  * Observers are called after callbacks are called, but they are called in the
  * same turn of the event loop as callbacks.
  *
  * See nsIContentPrefCallback2 below for more information about callbacks.
  */
 
-[scriptable, uuid(86279644-6b86-4875-a228-2d2ff2f3e33b)]
+[scriptable, uuid(133608c7-f812-41ca-bc1c-62a4eb95e52a)]
 interface nsIContentPrefService2 : nsISupports
 {
   /**
    * Gets the preference with the given domain and name.
    *
    * @param domain    The preference's domain.
    * @param name      The preference's name.
    * @param context   The private-browsing context, if any.
@@ -148,17 +148,17 @@ interface nsIContentPrefService2 : nsISu
    * @param name     The preferences' name.
    * @param context  The private-browsing context, if any.
    * @param len      The length of the returned array.
    * @param prefs    The array of preferences.
    */
   void getCachedBySubdomainAndName(in AString domain,
                                    in AString name,
                                    in nsILoadContext context,
-                                   [optional] out unsigned long len,
+                                   out unsigned long len,
                                    [retval,array,size_is(len)] out nsIContentPref prefs);
 
   /**
    * Synchronously retrieves from the in-memory cache the preference with no
    * domain and the given name.
    *
    * As with getCachedByDomainAndName, if the preference is cached then it is
    * returned; if the preference is known not to exist, then the value attribute