| Index: Source/core/events/EventTarget.h
|
| diff --git a/Source/core/events/EventTarget.h b/Source/core/events/EventTarget.h
|
| index bad0e5631bb9ceb76311879e18e60e3357658caa..62e6362fd6e9d36c77c6b8fc9abff1cb26efe238 100644
|
| --- a/Source/core/events/EventTarget.h
|
| +++ b/Source/core/events/EventTarget.h
|
| @@ -122,8 +122,8 @@ public:
|
| virtual LocalDOMWindow* toDOMWindow();
|
| virtual MessagePort* toMessagePort();
|
|
|
| - virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture);
|
| - virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture);
|
| + virtual bool addEventListener(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>, bool useCapture);
|
| + virtual bool removeEventListener(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>, bool useCapture);
|
| virtual void removeAllEventListeners();
|
| virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>);
|
|
|
| @@ -134,7 +134,7 @@ public:
|
| virtual void uncaughtExceptionInEventHandler();
|
|
|
| // Used for legacy "onEvent" attribute APIs.
|
| - bool setAttributeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>);
|
| + bool setAttributeEventListener(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>);
|
| EventListener* getAttributeEventListener(const AtomicString& eventType);
|
|
|
| bool hasEventListeners() const;
|
| @@ -214,15 +214,15 @@ public:
|
| // macros to avoid causing so many header includes.
|
| #define DEFINE_ATTRIBUTE_EVENT_LISTENER(attribute) \
|
| EventListener* on##attribute() { return getAttributeEventListener(EventTypeNames::attribute); } \
|
| - void setOn##attribute(PassRefPtr<EventListener> listener) { setAttributeEventListener(EventTypeNames::attribute, listener); } \
|
| + void setOn##attribute(PassRefPtrWillBeRawPtr<EventListener> listener) { setAttributeEventListener(EventTypeNames::attribute, listener); } \
|
|
|
| #define DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(attribute) \
|
| static EventListener* on##attribute(EventTarget& eventTarget) { return eventTarget.getAttributeEventListener(EventTypeNames::attribute); } \
|
| - static void setOn##attribute(EventTarget& eventTarget, PassRefPtr<EventListener> listener) { eventTarget.setAttributeEventListener(EventTypeNames::attribute, listener); } \
|
| + static void setOn##attribute(EventTarget& eventTarget, PassRefPtrWillBeRawPtr<EventListener> listener) { eventTarget.setAttributeEventListener(EventTypeNames::attribute, listener); } \
|
|
|
| #define DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(attribute) \
|
| EventListener* on##attribute() { return document().getWindowAttributeEventListener(EventTypeNames::attribute); } \
|
| - void setOn##attribute(PassRefPtr<EventListener> listener) { document().setWindowAttributeEventListener(EventTypeNames::attribute, listener); } \
|
| + void setOn##attribute(PassRefPtrWillBeRawPtr<EventListener> listener) { document().setWindowAttributeEventListener(EventTypeNames::attribute, listener); } \
|
|
|
| #define DEFINE_STATIC_WINDOW_ATTRIBUTE_EVENT_LISTENER(attribute) \
|
| static EventListener* on##attribute(EventTarget& eventTarget) { \
|
| @@ -231,7 +231,7 @@ public:
|
| ASSERT(eventTarget.toDOMWindow()); \
|
| return eventTarget.getAttributeEventListener(EventTypeNames::attribute); \
|
| } \
|
| - static void setOn##attribute(EventTarget& eventTarget, PassRefPtr<EventListener> listener) { \
|
| + static void setOn##attribute(EventTarget& eventTarget, PassRefPtrWillBeRawPtr<EventListener> listener) { \
|
| if (Node* node = eventTarget.toNode()) \
|
| node->document().setWindowAttributeEventListener(EventTypeNames::attribute, listener); \
|
| else { \
|
| @@ -242,15 +242,15 @@ public:
|
|
|
| #define DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(attribute, eventName) \
|
| EventListener* on##attribute() { return getAttributeEventListener(EventTypeNames::eventName); } \
|
| - void setOn##attribute(PassRefPtr<EventListener> listener) { setAttributeEventListener(EventTypeNames::eventName, listener); } \
|
| + void setOn##attribute(PassRefPtrWillBeRawPtr<EventListener> listener) { setAttributeEventListener(EventTypeNames::eventName, listener); } \
|
|
|
| #define DECLARE_FORWARDING_ATTRIBUTE_EVENT_LISTENER(recipient, attribute) \
|
| EventListener* on##attribute(); \
|
| - void setOn##attribute(PassRefPtr<EventListener> listener);
|
| + void setOn##attribute(PassRefPtrWillBeRawPtr<EventListener> listener);
|
|
|
| #define DEFINE_FORWARDING_ATTRIBUTE_EVENT_LISTENER(type, recipient, attribute) \
|
| EventListener* type::on##attribute() { return recipient ? recipient->getAttributeEventListener(EventTypeNames::attribute) : 0; } \
|
| - void type::setOn##attribute(PassRefPtr<EventListener> listener) \
|
| + void type::setOn##attribute(PassRefPtrWillBeRawPtr<EventListener> listener) \
|
| { \
|
| if (recipient) \
|
| recipient->setAttributeEventListener(EventTypeNames::attribute, listener); \
|
|
|