Bug 455806: outparamdel nsIPrivateTextEvent r+sr=jst

content/events/public/nsIPrivateTextEvent.h

@@ -53,8 +53,8 @@ public:
 	NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTEVENT_IID)
 
 	NS_IMETHOD GetText(nsString& aText) = 0;
-	NS_IMETHOD GetInputRange(nsIPrivateTextRangeList** aInputRange) = 0;
-	NS_IMETHOD GetEventReply(struct nsTextEventReply** aReply) = 0;
+	NS_IMETHOD_(already_AddRefed<nsIPrivateTextRangeList>) GetInputRange() = 0;
+	NS_IMETHOD_(nsTextEventReply*) GetEventReply() = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateTextEvent, NS_IPRIVATETEXTEVENT_IID)

content/events/src/nsDOMTextEvent.cpp

@@ -97,27 +97,23 @@ NS_METHOD nsDOMTextEvent::GetText(nsString& aText)
   return NS_OK;
 }
 
-NS_METHOD nsDOMTextEvent::GetInputRange(nsIPrivateTextRangeList** aInputRange)
+NS_METHOD_(already_AddRefed<nsIPrivateTextRangeList>) nsDOMTextEvent::GetInputRange()
 {
-  if (mEvent->message == NS_TEXT_TEXT)
-  {
-    *aInputRange = mTextRange;
-    NS_IF_ADDREF(*aInputRange);
-    return NS_OK;
+  if (mEvent->message == NS_TEXT_TEXT) {
+    nsRefPtr<nsPrivateTextRangeList> textRange = mTextRange;
+    nsPrivateTextRangeList *textRangePtr = nsnull;
+    textRange.swap(textRangePtr);
+    return textRangePtr;
   }
-  *aInputRange = nsnull;
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 
-NS_METHOD nsDOMTextEvent::GetEventReply(nsTextEventReply** aReply)
+NS_METHOD_(nsTextEventReply*) nsDOMTextEvent::GetEventReply()
 {
-  if (mEvent->message == NS_TEXT_TEXT)
-  {
-     *aReply = &(static_cast<nsTextEvent*>(mEvent)->theReply);
-     return NS_OK;
+  if (mEvent->message == NS_TEXT_TEXT) {
+     return &(static_cast<nsTextEvent*>(mEvent)->theReply);
   }
-  aReply = 0;
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 
 nsresult NS_NewDOMTextEvent(nsIDOMEvent** aInstancePtrResult,

content/events/src/nsDOMTextEvent.h

@@ -56,8 +56,8 @@ public:
 
   // nsIPrivateTextEvent interface
   NS_IMETHOD GetText(nsString& aText);
-  NS_IMETHOD GetInputRange(nsIPrivateTextRangeList** aInputRange);
-  NS_IMETHOD GetEventReply(nsTextEventReply** aReply);
+  NS_IMETHOD_(already_AddRefed<nsIPrivateTextRangeList>) GetInputRange();
+  NS_IMETHOD_(nsTextEventReply*) GetEventReply();
   
 protected:
   nsString mText;

editor/libeditor/text/nsEditorEventListeners.cpp

@@ -460,8 +460,8 @@ nsTextEditorTextListener::HandleText(nsIDOMEvent* aTextEvent)
    nsTextEventReply*                 textEventReply;
 
    textEvent->GetText(composedText);
-   textEvent->GetInputRange(getter_AddRefs(textRangeList));
-   textEvent->GetEventReply(&textEventReply);
+   textRangeList = textEvent->GetInputRange();
+   textEventReply = textEvent->GetEventReply();
    nsCOMPtr<nsIEditorIMESupport> imeEditor = do_QueryInterface(mEditor, &result);
    if (imeEditor) {
      PRUint32 flags;