Bug 760011 - Make nsIMozSmsRequest inherits from nsIDOMDOMRequest. r=sicking

--HG--
extra : rebase_source : 1ccde2191835bc7eddd68ff2afc12fa73897f5d1

dom/sms/interfaces/nsIDOMSmsRequest.idl

@@ -2,21 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsIDOMEventTarget.idl"
+#include "nsIDOMDOMRequest.idl"
 
-interface nsIDOMEventListener;
-interface nsIDOMDOMError;
-
-[scriptable, builtinclass, uuid(a41765d7-6e5d-4458-b08a-993c2c60ce88)]
-interface nsIDOMMozSmsRequest : nsIDOMEventTarget
+[scriptable, builtinclass, uuid(f77caa0f-d957-40b4-b1c6-195ebaace60c)]
+interface nsIDOMMozSmsRequest : nsIDOMDOMRequest
 {
-  // Returns whether "processing" or "done".
-  readonly attribute DOMString           readyState;
-  // Can be null.
-  readonly attribute nsIDOMDOMError      error;
-  // Can be bool, nsIDOMSmsMessage, nsIDOMSmsIterator or null.
-  readonly attribute jsval               result;
-
-           attribute nsIDOMEventListener onsuccess;
-           attribute nsIDOMEventListener onerror;
 };

dom/sms/src/SmsRequest.cpp

@@ -52,6 +52,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SmsRequest)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsRequest)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMDOMRequest)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMMozSmsRequest)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozSmsRequest)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

dom/sms/src/SmsRequest.h

@@ -24,6 +24,7 @@ public:
   friend class SmsRequestManager;
 
   NS_DECL_ISUPPORTS
+  NS_DECL_NSIDOMDOMREQUEST
   NS_DECL_NSIDOMMOZSMSREQUEST
 
   NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)