Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / events / EventTarget.cpp

diff --git a/src/third_party/WebKit/Source/core/events/EventTarget.cpp b/src/third_party/WebKit/Source/core/events/EventTarget.cpp
index 61084c3..5dede6f 100644 (file)
--- a/src/third_party/WebKit/Source/core/events/EventTarget.cpp
+++ b/src/third_party/WebKit/Source/core/events/EventTarget.cpp
@@ -59,7 +59,6 @@ EventTargetData::~EventTargetData()
 
 EventTarget::EventTarget()
 {
-    ScriptWrappable::init(this);
 }
 
 EventTarget::~EventTarget()
@@ -108,6 +107,11 @@ bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<Eve
 
 bool EventTarget::removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
 {
+    // FIXME: listener null check should throw TypeError (and be done in
+    // generated bindings), but breaks legacy content. http://crbug.com/249598
+    if (!listener)
+        return false;
+
     EventTargetData* d = eventTargetData();
     if (!d)
         return false;