Return already_AddRefed instead of a raw addrefed pointer. Bug 211195, r+sr=bryner

content/events/src/nsEventStateManager.cpp

@@ -795,7 +795,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
       // focused sub-window and sub-element for this top-level
       // window.
 
-      nsCOMPtr<nsIFocusController> focusController = dont_AddRef(GetFocusControllerForDocument(mDocument));
+      nsCOMPtr<nsIFocusController> focusController = GetFocusControllerForDocument(mDocument);
       if (focusController)
         focusController->SetSuppressFocus(PR_TRUE, "Deactivate Suppression");
 
@@ -5482,7 +5482,7 @@ nsEventStateManager::ShiftFocusByDoc(PRBool aForward)
 }
 
 // Get the FocusController given an nsIDocument
-nsIFocusController*
+already_AddRefed<nsIFocusController>
 nsEventStateManager::GetFocusControllerForDocument(nsIDocument* aDocument)
 {
   nsCOMPtr<nsISupports> container;

content/events/src/nsEventStateManager.h

@@ -47,6 +47,7 @@
 #include "nsWeakReference.h"
 #include "nsHashtable.h"
 #include "nsITimer.h"
+#include "nsCOMPtr.h"
 #include "nsIDocument.h"
 #include "nsCOMArray.h"
 
@@ -185,7 +186,7 @@ protected:
   void EnsureDocument(nsIPresShell* aPresShell);
   void EnsureDocument(nsIPresContext* aPresContext);
   void FlushPendingEvents(nsIPresContext* aPresContext);
-  nsIFocusController* GetFocusControllerForDocument(nsIDocument* aDocument);
+  already_AddRefed<nsIFocusController> GetFocusControllerForDocument(nsIDocument* aDocument);
 
   typedef enum {
     eAccessKeyProcessingNormal = 0,