diff -r 000000000000 -r 6474c204b198 dom/events/EventTarget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/events/EventTarget.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 "mozilla/EventListenerManager.h"
+#include "mozilla/dom/EventTarget.h"
+#include "nsThreadUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+void
+EventTarget::RemoveEventListener(const nsAString& aType,
+                                 EventListener* aListener,
+                                 bool aUseCapture,
+                                 ErrorResult& aRv)
+{
+  EventListenerManager* elm = GetExistingListenerManager();
+  if (elm) {
+    elm->RemoveEventListener(aType, aListener, aUseCapture);
+  }
+}
+
+EventHandlerNonNull*
+EventTarget::GetEventHandler(nsIAtom* aType, const nsAString& aTypeString)
+{
+  EventListenerManager* elm = GetExistingListenerManager();
+  return elm ? elm->GetEventHandler(aType, aTypeString) : nullptr;
+}
+
+void
+EventTarget::SetEventHandler(const nsAString& aType,
+                             EventHandlerNonNull* aHandler,
+                             ErrorResult& aRv)
+{
+  if (!StringBeginsWith(aType, NS_LITERAL_STRING("on"))) {
+    aRv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+  if (NS_IsMainThread()) {
+    nsCOMPtr<nsIAtom> type = do_GetAtom(aType);
+    SetEventHandler(type, EmptyString(), aHandler);
+    return;
+  }
+  SetEventHandler(nullptr,
+                  Substring(aType, 2), // Remove "on"
+                  aHandler);
+}
+
+void
+EventTarget::SetEventHandler(nsIAtom* aType, const nsAString& aTypeString,
+                             EventHandlerNonNull* aHandler)
+{
+  GetOrCreateListenerManager()->SetEventHandler(aType, aTypeString, aHandler);
+}
+
+} // namespace dom
+} // namespace mozilla