From edb39036690fd025b1fac4af0c7c24ca690cffc6 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 6 Jun 2014 10:06:26 +0200
Subject: [PATCH] Bug 1017762 - Remove the language argument to
 EventListenerManager::SetEventHandler; r=smaug

---
 content/base/src/Element.cpp        |  1 -
 dom/events/EventListenerManager.cpp | 15 ---------------
 dom/events/EventListenerManager.h   |  1 -
 3 files changed, 17 deletions(-)

diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp
index a527f0dceb20..f66c2f3d4661 100644
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@@ -1775,7 +1775,6 @@ Element::SetEventHandler(nsIAtom* aEventName,
 
   defer = defer && aDefer; // only defer if everyone agrees...
   manager->SetEventHandler(aEventName, aValue,
-                           nsIProgrammingLanguage::JAVASCRIPT,
                            defer, !nsContentUtils::IsChromeDoc(ownerDoc),
                            this);
   return NS_OK;
diff --git a/dom/events/EventListenerManager.cpp b/dom/events/EventListenerManager.cpp
index 6d7c4dc9ba36..123b059b952f 100644
--- a/dom/events/EventListenerManager.cpp
+++ b/dom/events/EventListenerManager.cpp
@@ -641,25 +641,10 @@ EventListenerManager::SetEventHandlerInternal(
 nsresult
 EventListenerManager::SetEventHandler(nsIAtom* aName,
                                       const nsAString& aBody,
-                                      uint32_t aLanguage,
                                       bool aDeferCompilation,
                                       bool aPermitUntrustedEvents,
                                       Element* aElement)
 {
-  NS_PRECONDITION(aLanguage != nsIProgrammingLanguage::UNKNOWN,
-                  "Must know the language for the script event listener");
-
-  // |aPermitUntrustedEvents| is set to False for chrome - events
-  // *generated* from an unknown source are not allowed.
-  // However, for script languages with no 'sandbox', we want to reject
-  // such scripts based on the source of their code, not just the source
-  // of the event.
-  if (aPermitUntrustedEvents && 
-      aLanguage != nsIProgrammingLanguage::JAVASCRIPT) {
-    NS_WARNING("Discarding non-JS event listener from untrusted source");
-    return NS_ERROR_FAILURE;
-  }
-
   nsCOMPtr<nsIDocument> doc;
   nsCOMPtr<nsIScriptGlobalObject> global =
     GetScriptGlobalAndDocument(getter_AddRefs(doc));
diff --git a/dom/events/EventListenerManager.h b/dom/events/EventListenerManager.h
index cc70c0d24f47..c26b9d1668dd 100644
--- a/dom/events/EventListenerManager.h
+++ b/dom/events/EventListenerManager.h
@@ -292,7 +292,6 @@ public:
   // documents?  Need to double-check the spec here.
   nsresult SetEventHandler(nsIAtom *aName,
                            const nsAString& aFunc,
-                           uint32_t aLanguage,
                            bool aDeferCompilation,
                            bool aPermitUntrustedEvents,
                            dom::Element* aElement);