Bug 1124261, part 3 - Inline NS_NewXBLKeyEventHandler. r=smaug

dom/xbl/nsXBLEventHandler.cpp

@@ -181,17 +181,3 @@ NS_NewXBLEventHandler(nsXBLPrototypeHandler* aHandler,
 
   return handler.forget();
 }
-
-nsresult
-NS_NewXBLKeyEventHandler(nsIAtom* aEventType, uint8_t aPhase, uint8_t aType,
-                         nsXBLKeyEventHandler** aResult)
-{
-  *aResult = new nsXBLKeyEventHandler(aEventType, aPhase, aType);
-
-  if (!*aResult)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aResult);
-
-  return NS_OK;
-}

dom/xbl/nsXBLEventHandler.h

@@ -117,8 +117,4 @@ already_AddRefed<nsXBLEventHandler>
 NS_NewXBLEventHandler(nsXBLPrototypeHandler* aHandler,
                       nsIAtom* aEventType);
 
-nsresult
-NS_NewXBLKeyEventHandler(nsIAtom* aEventType, uint8_t aPhase,
-                         uint8_t aType, nsXBLKeyEventHandler** aResult);
-
 #endif

dom/xbl/nsXBLPrototypeBinding.cpp

@@ -807,11 +807,9 @@ nsXBLPrototypeBinding::CreateKeyHandlers()
       }
 
       if (i == count) {
-        nsRefPtr<nsXBLKeyEventHandler> newHandler;
+        nsRefPtr<nsXBLKeyEventHandler> newHandler =
-        NS_NewXBLKeyEventHandler(eventAtom, phase, type,
+          new nsXBLKeyEventHandler(eventAtom, phase, type);
-                                 getter_AddRefs(newHandler));
+        mKeyHandlers.AppendObject(newHandler);
-        if (newHandler)
-          mKeyHandlers.AppendObject(newHandler);
         handler = newHandler;
       }