Backout changeset a54f620cf84c (bug 843445) for build failures
authorRandell Jesup <rjesup@jesup.org>
Tue, 09 Apr 2013 03:55:21 -0400
changeset 134908 488db939e3e10e919d694b3b84151659c62274ef
parent 134907 2f10c3704fe57595c5d84442493666ddab2d8d93
child 134909 47ca2082e78412660df557e02ed0a9d5265bc543
push id3752
push userlsblakk@mozilla.com
push dateMon, 13 May 2013 17:21:10 +0000
treeherdermozilla-aurora@1580544aef0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs843445
milestone23.0a1
backs outa54f620cf84c0a8b2982c43e9b11ac6b67f95b28
Backout changeset a54f620cf84c (bug 843445) for build failures
dom/mms/interfaces/nsIMmsService.idl
dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
dom/mobilemessage/src/MobileMessageManager.cpp
--- a/dom/mms/interfaces/nsIMmsService.idl
+++ b/dom/mms/interfaces/nsIMmsService.idl
@@ -5,17 +5,14 @@
 #include "nsISupports.idl"
 interface nsIMobileMessageCallback;
 interface nsIDOMBlob;
 
 %{C++
 #define RIL_MMSSERVICE_CONTRACTID "@mozilla.org/mms/rilmmsservice;1"
 %}
 
-[scriptable, uuid(e5ef630a-eab7-425a-ac42-650ef5c4fcef)]
+[scriptable, uuid(3ec33286-8559-11e2-9f38-e76b58650568)]
 interface nsIMmsService : nsISupports
 {
   void send(in jsval parameters /* MmsParameters */,
             in nsIMobileMessageCallback request);
-
-  void retrieve(in long id,
-                in nsIMobileMessageCallback request);
 };
--- a/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
+++ b/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
@@ -10,26 +10,17 @@
 interface nsIRilMobileMessageDatabaseCallback : nsISupports
 {
   /**
    * |aDomMessage|: the nsIDOMMoz{Mms,Sms}Message
    */
   void notify(in nsresult aRv, in nsISupports aDomMessage);
 };
 
-[scriptable, function, uuid(2be52603-5885-412c-9225-f78a78f1bbbd)]
-interface nsIRilMobileMessageDatabaseRecordCallback : nsISupports
-{
-  /**
-   * |aMessageRecord| Object: the mobile-message database record
-   */
-  void notify(in nsresult aRv, in jsval aMessageRecord);
-};
-
-[scriptable, uuid(8f49216f-bc0c-420e-b77e-7f1cbdcd245f)]
+[scriptable, uuid(a31b1716-8631-11e2-afaa-2fbd087f426e)]
 interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
 {
   /**
    * |aMessage| Object: should contain the following properties for internal use:
    *   - |type| DOMString: "sms" or "mms"
    *   - |sender| DOMString: the phone number of sender
    *   - |timestamp| Number: the timestamp of received message
    *
@@ -69,17 +60,9 @@ interface nsIRilMobileMessageDatabaseSer
    * |aDeliveryStatus| DOMString: the new delivery status to update (can be null).
    * |aCallback| nsIRilMobileMessageDatabaseCallback: an optional callback.
    */
   void setMessageDelivery(in long aMessageId,
                           in DOMString aReceiver,
                           in DOMString aDelivery,
                           in DOMString aDeliveryStatus,
                [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
-
-  /**
-   * |aMessageId| Number: the message's DB record ID.
-   * |aCallback| nsIRilMobileMessageDatabaseCallback: a callback which takes
-   *   result flag and message record as parameters.
-   */
-  void getMessageRecordById(in long aMessageId,
-                            in nsIRilMobileMessageDatabaseRecordCallback aCallback);
 };
--- a/dom/mobilemessage/src/MobileMessageManager.cpp
+++ b/dom/mobilemessage/src/MobileMessageManager.cpp
@@ -332,33 +332,16 @@ MobileMessageManager::GetThreads(nsIDOMD
   NS_ENSURE_SUCCESS(rv, rv);
 
   cursorCallback->mDOMCursor = new DOMCursor(GetOwner(), continueCallback);
   NS_ADDREF(*aCursor = cursorCallback->mDOMCursor);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP
-MobileMessageManager::RetrieveMMS(int32_t id,
-                                  nsIDOMDOMRequest** aRequest)
-{
-    nsCOMPtr<nsIMmsService> mmsService = do_GetService(RIL_MMSSERVICE_CONTRACTID);
-    NS_ENSURE_TRUE(mmsService, NS_ERROR_FAILURE);
-
-    nsRefPtr<DOMRequest> request = new DOMRequest(GetOwner());
-    nsCOMPtr<nsIMobileMessageCallback> msgCallback = new MobileMessageCallback(request);
-
-    nsresult rv = mmsService->Retrieve(id, msgCallback);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    request.forget(aRequest);
-    return NS_OK;
-}
-
 nsresult
 MobileMessageManager::DispatchTrustedSmsEventToSelf(const nsAString& aEventName,
                                                     nsIDOMMozSmsMessage* aMessage)
 {
   nsCOMPtr<nsIDOMEvent> event;
   NS_NewDOMMozSmsEvent(getter_AddRefs(event), this, nullptr, nullptr);
   NS_ASSERTION(event, "This should never fail!");