Backed out changeset af87fa0a3052 because of build failures

content/base/public/nsIDOMFile.idl

@@ -68,14 +68,10 @@ interface nsIDOMFile : nsIDOMBlob
   // This performs no security checks!
   [noscript] readonly attribute DOMString mozFullPathInternal;
 
-  /**
-   * @deprecated
-   */
-  [deprecated] readonly attribute DOMString fileName;
-  /**
-   * @deprecated
-   */
-  [deprecated] readonly attribute unsigned long long fileSize;
+  // These are all deprecated and not in spec. Will be removed in a future
+  // release
+  readonly attribute DOMString fileName;
+  readonly attribute unsigned long long fileSize;
   DOMString getAsText(in DOMString encoding); // raises(FileException) on retrieval
   DOMString getAsDataURL();             // raises(FileException) on retrieval
   DOMString getAsBinary();              // raises(FileException) on retrieval

content/base/public/nsISyncLoadDOMService.idl

@@ -64,11 +64,9 @@ interface nsIChannel;
 /**
  * The nsISyncDOMLoadService interface can be used to synchronously load
  * a document.
- *
- * @deprecated use XMLHttpRequest instead
  */
 
-[deprecated, scriptable, uuid(8095998d-ae1c-4cfa-9b43-0973e5d77eb0)]
+[scriptable, uuid(8095998d-ae1c-4cfa-9b43-0973e5d77eb0)]
 interface nsISyncLoadDOMService : nsISupports
 {
     /**

content/base/public/nsIXMLHttpRequest.idl

@@ -391,9 +391,9 @@ interface nsIXHRSendable : nsISupports {
 };
 
 /**
- * @deprecated
+ * DEPRECATED.
  */
-[deprecated, scriptable, uuid(423fdd3d-41c9-4149-8fe5-b14a1d3912a0)]
+[scriptable, uuid(423fdd3d-41c9-4149-8fe5-b14a1d3912a0)]
 interface nsIJSXMLHttpRequest : nsISupports {
   /**
    * Meant to be a script-only mechanism for setting an upload progress event

content/xslt/public/nsIXSLTProcessorObsolete.idl

@@ -44,10 +44,10 @@ interface nsIDOMNode;
 interface nsIDOMDocument;
 
 /**
- * @deprecated Use nsIXSLTProcessor instead!!
+ * DEPRECATED! Don't use this interface! Use nsIXSLTProcessor instead!!
  */
 
-[deprecated, scriptable, uuid(3fbff728-2d20-11d3-aef3-00108300ff91)]
+[scriptable, uuid(3fbff728-2d20-11d3-aef3-00108300ff91)]
 interface nsIXSLTProcessorObsolete : nsISupports
 {
     void transformDocument(in nsIDOMNode aSourceDOM,

dom/interfaces/base/nsIDOMJSWindow.idl

@@ -70,11 +70,11 @@ interface nsIDOMJSWindow : nsISupports
    * @deprecated These are old Netscape 4 methods. Do not use,
    *             the implementation is no-op.
    */
-  [deprecated] void         captureEvents(in long eventFlags);
-  [deprecated] void         releaseEvents(in long eventFlags);
-  [deprecated] void         routeEvent(in nsIDOMEvent evt);
-  [deprecated] void         enableExternalCapture();
-  [deprecated] void         disableExternalCapture();
+  void                      captureEvents(in long eventFlags);
+  void                      releaseEvents(in long eventFlags);
+  void                      routeEvent(in nsIDOMEvent evt);
+  void                      enableExternalCapture();
+  void                      disableExternalCapture();
 
   /**
    * This is the scriptable version of nsIDOMWindowInternal::open()

dom/interfaces/events/nsIDOMNSEvent.idl

@@ -107,12 +107,12 @@ interface nsIDOMNSEvent : nsISupports
   /**
    * @deprecated Use nsIDOMEvent::stopPropagation.
    */
-  [deprecated] void         preventBubble();
+  void                      preventBubble();
 
   /**
    * @deprecated Use nsIDOMEvent::stopPropagation.
    */
-  [deprecated] void         preventCapture();
+  void                      preventCapture();
 
   boolean                   getPreventDefault();
 

dom/interfaces/html/nsIDOMNSHTMLDocument.idl

@@ -72,9 +72,9 @@ interface nsIDOMNSHTMLDocument : nsISupports
    * @deprecated These are old Netscape 4 methods. Do not use,
    *             the implementation is no-op.
    */
-  [deprecated] void         captureEvents(in long eventFlags);
-  [deprecated] void         releaseEvents(in long eventFlags);
-  [deprecated] void         routeEvent(in nsIDOMEvent evt);
+  void                      captureEvents(in long eventFlags);
+  void                      releaseEvents(in long eventFlags);
+  void                      routeEvent(in nsIDOMEvent evt);
 
   // returns "BackCompat" if we're in quirks mode,
   // or "CSS1Compat" if we're in strict mode

dom/interfaces/offline/nsIDOMOfflineResourceList.idl

@@ -58,17 +58,17 @@ interface nsIDOMOfflineResourceList : nsISupports
 
   /**
    * Get the number of dynamically-managed entries.
-   *
-   * @deprecated Clients should use the "items" attribute.
+   * @status DEPRECATED
+   *         Clients should use the "items" attribute.
    */
-  [deprecated] readonly attribute unsigned long mozLength;
+  readonly attribute unsigned long mozLength;
 
   /**
    * Get the URI of a dynamically-managed entry.
-   *
-   * @deprecated Clients should use the "items" attribute.
+   * @status DEPRECATED
+   *         Clients should use the "items" attribute.
    */
-  [deprecated] DOMString mozItem(in unsigned long index);
+  DOMString mozItem(in unsigned long index);
 
   /**
    * Add an item to the list of dynamically-managed entries.  The resource