Add AddEventListenerOptions addEventListenerOptions interface.

third_party/WebKit/Source/core/events/RegisteredEventListener.h

Index: third_party/WebKit/Source/core/events/RegisteredEventListener.h
diff --git a/third_party/WebKit/Source/core/events/RegisteredEventListener.h b/third_party/WebKit/Source/core/events/RegisteredEventListener.h
index 03b3f90a89f7572f8c6d571fc9aa7bf25cd3dd8d..9a711e7ece456f66301b8203f3766a18fd2ec7ae 100644
--- a/third_party/WebKit/Source/core/events/RegisteredEventListener.h
+++ b/third_party/WebKit/Source/core/events/RegisteredEventListener.h
@@ -24,6 +24,7 @@
 #ifndef RegisteredEventListener_h
 #define RegisteredEventListener_h
 
+#include "core/events/AddEventListenerOptions.h"
 #include "core/events/EventListener.h"
 #include "wtf/RefPtr.h"
 
@@ -32,21 +33,34 @@ namespace blink {
 class RegisteredEventListener {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
-    RegisteredEventListener(EventListener* listener, const EventListenerOptions& options)
+    RegisteredEventListener()
+        : useCapture(false)
+        , passive(false)
+    {
+    }
+
+    RegisteredEventListener(EventListener* listener, const AddEventListenerOptions& options)
         : listener(listener)
         , useCapture(options.capture())
         , passive(options.passive())
     {
     }
 
+    RegisteredEventListener(EventListener* listener, const EventListenerOptions& options)
+        : listener(listener)
+        , useCapture(options.capture())
+        , passive(false)
+    {
+    }
+
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(listener);
     }
 
-    EventListenerOptions options() const
+    AddEventListenerOptions options() const
     {
-        EventListenerOptions result;
+        AddEventListenerOptions result;
         result.setCapture(useCapture);
         result.setPassive(passive);
         return result;
@@ -60,9 +74,10 @@ public:
 inline bool operator==(const RegisteredEventListener& a, const RegisteredEventListener& b)
 {
 
+    // Equality is soley based on the listener and useCapture flags
     ASSERT(a.listener);
     ASSERT(b.listener);
-    return *a.listener == *b.listener && a.useCapture == b.useCapture && a.passive == b.passive;
+    return *a.listener == *b.listener && a.useCapture == b.useCapture;
 }
 
 } // namespace blink