| Index: third_party/WebKit/Source/core/frame/EventHandlerRegistry.h
|
| diff --git a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.h b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.h
|
| index 18de8230a4bb127791f41048d30506c161f221d0..0a8a49864d97167243fbfab2aa1039326c1276ed 100644
|
| --- a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.h
|
| +++ b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.h
|
| @@ -12,6 +12,7 @@
|
| namespace blink {
|
|
|
| class Document;
|
| +class EventListenerOptions;
|
| class EventTarget;
|
|
|
| typedef HashCountedSet<RawPtrWillBeUntracedMember<EventTarget>> EventTargetSet;
|
| @@ -30,7 +31,9 @@ public:
|
| enum EventHandlerClass {
|
| ScrollEvent,
|
| WheelEvent,
|
| + WheelEventPassive,
|
| TouchEvent,
|
| + TouchEventPassive,
|
| #if ENABLE(ASSERT)
|
| // Additional event categories for verifying handler tracking logic.
|
| EventsForTesting,
|
| @@ -45,9 +48,9 @@ public:
|
| const EventTargetSet* eventHandlerTargets(EventHandlerClass) const;
|
|
|
| // Registration and management of event handlers attached to EventTargets.
|
| - void didAddEventHandler(EventTarget&, const AtomicString& eventType);
|
| + void didAddEventHandler(EventTarget&, const AtomicString& eventType, const EventListenerOptions&);
|
| void didAddEventHandler(EventTarget&, EventHandlerClass);
|
| - void didRemoveEventHandler(EventTarget&, const AtomicString& eventType);
|
| + void didRemoveEventHandler(EventTarget&, const AtomicString& eventType, const EventListenerOptions&);
|
| void didRemoveEventHandler(EventTarget&, EventHandlerClass);
|
| void didRemoveAllEventHandlers(EventTarget&);
|
|
|
| @@ -72,7 +75,7 @@ private:
|
| };
|
|
|
| // Returns true if |eventType| belongs to a class this registry tracks.
|
| - static bool eventTypeToClass(const AtomicString& eventType, EventHandlerClass* result);
|
| + static bool eventTypeToClass(const AtomicString& eventType, const EventListenerOptions&, EventHandlerClass* result);
|
|
|
| // Returns true if the operation actually added a new target or completely
|
| // removed an existing one.
|
| @@ -91,7 +94,7 @@ private:
|
|
|
| // Record a change operation to a given event handler class and notify any
|
| // parent registry and other clients accordingly.
|
| - void updateEventHandlerOfType(ChangeOperation, const AtomicString& eventType, EventTarget*);
|
| + void updateEventHandlerOfType(ChangeOperation, const AtomicString& eventType, const EventListenerOptions&, EventTarget*);
|
|
|
| void updateEventHandlerInternal(ChangeOperation, EventHandlerClass, EventTarget*);
|
|
|
|
|