| Index: third_party/WebKit/Source/core/events/Event.h
|
| diff --git a/third_party/WebKit/Source/core/events/Event.h b/third_party/WebKit/Source/core/events/Event.h
|
| index 262ce668a3069fdbaa6a9c2a416eecc767ca5b6f..93005a6bd54225df132d7ccdefceca6be02f8405 100644
|
| --- a/third_party/WebKit/Source/core/events/Event.h
|
| +++ b/third_party/WebKit/Source/core/events/Event.h
|
| @@ -40,7 +40,7 @@ class DOMWrapperWorld;
|
| class EventTarget;
|
| class ExecutionContext;
|
|
|
| -class CORE_EXPORT Event : public RefCountedWillBeGarbageCollectedFinalized<Event>, public ScriptWrappable {
|
| +class CORE_EXPORT Event : public GarbageCollectedFinalized<Event>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| enum PhaseType {
|
| @@ -75,34 +75,34 @@ public:
|
| RailsModeVertical = 2
|
| };
|
|
|
| - static PassRefPtrWillBeRawPtr<Event> create()
|
| + static RawPtr<Event> create()
|
| {
|
| - return adoptRefWillBeNoop(new Event);
|
| + return (new Event);
|
| }
|
|
|
| // A factory for a simple event. The event doesn't bubble, and isn't
|
| // cancelable.
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#fire-a-simple-event
|
| - static PassRefPtrWillBeRawPtr<Event> create(const AtomicString& type)
|
| + static RawPtr<Event> create(const AtomicString& type)
|
| {
|
| - return adoptRefWillBeNoop(new Event(type, false, false));
|
| + return (new Event(type, false, false));
|
| }
|
| - static PassRefPtrWillBeRawPtr<Event> createCancelable(const AtomicString& type)
|
| + static RawPtr<Event> createCancelable(const AtomicString& type)
|
| {
|
| - return adoptRefWillBeNoop(new Event(type, false, true));
|
| + return (new Event(type, false, true));
|
| }
|
| - static PassRefPtrWillBeRawPtr<Event> createBubble(const AtomicString& type)
|
| + static RawPtr<Event> createBubble(const AtomicString& type)
|
| {
|
| - return adoptRefWillBeNoop(new Event(type, true, false));
|
| + return (new Event(type, true, false));
|
| }
|
| - static PassRefPtrWillBeRawPtr<Event> createCancelableBubble(const AtomicString& type)
|
| + static RawPtr<Event> createCancelableBubble(const AtomicString& type)
|
| {
|
| - return adoptRefWillBeNoop(new Event(type, true, true));
|
| + return (new Event(type, true, true));
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<Event> create(const AtomicString& type, const EventInit& initializer)
|
| + static RawPtr<Event> create(const AtomicString& type, const EventInit& initializer)
|
| {
|
| - return adoptRefWillBeNoop(new Event(type, initializer));
|
| + return (new Event(type, initializer));
|
| }
|
|
|
| virtual ~Event();
|
| @@ -113,7 +113,7 @@ public:
|
| void setType(const AtomicString& type) { m_type = type; }
|
|
|
| EventTarget* target() const { return m_target.get(); }
|
| - void setTarget(PassRefPtrWillBeRawPtr<EventTarget>);
|
| + void setTarget(RawPtr<EventTarget>);
|
|
|
| EventTarget* currentTarget() const;
|
| void setCurrentTarget(EventTarget* currentTarget) { m_currentTarget = currentTarget; }
|
| @@ -180,12 +180,12 @@ public:
|
| void setCancelBubble(bool cancel) { m_cancelBubble = cancel; }
|
|
|
| Event* underlyingEvent() const { return m_underlyingEvent.get(); }
|
| - void setUnderlyingEvent(PassRefPtrWillBeRawPtr<Event>);
|
| + void setUnderlyingEvent(RawPtr<Event>);
|
|
|
| EventPath& eventPath() { ASSERT(m_eventPath); return *m_eventPath; }
|
| void initEventPath(Node&);
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<EventTarget>> path(ScriptState*) const;
|
| + HeapVector<Member<EventTarget>> path(ScriptState*) const;
|
|
|
| bool isBeingDispatched() const { return eventPhase(); }
|
|
|
| @@ -193,7 +193,7 @@ public:
|
| // ErrorEvent behaves, can override this method.
|
| virtual bool canBeDispatchedInWorld(const DOMWrapperWorld&) const { return true; }
|
|
|
| - virtual PassRefPtrWillBeRawPtr<EventDispatchMediator> createMediator();
|
| + virtual RawPtr<EventDispatchMediator> createMediator();
|
|
|
| bool isTrusted() const { return m_isTrusted; }
|
| void setTrusted(bool value) { m_isTrusted = value; }
|
| @@ -230,11 +230,11 @@ private:
|
| unsigned m_handlingPassive : 1;
|
|
|
| unsigned short m_eventPhase;
|
| - RefPtrWillBeMember<EventTarget> m_currentTarget;
|
| - RefPtrWillBeMember<EventTarget> m_target;
|
| + Member<EventTarget> m_currentTarget;
|
| + Member<EventTarget> m_target;
|
| DOMTimeStamp m_createTime;
|
| - RefPtrWillBeMember<Event> m_underlyingEvent;
|
| - OwnPtrWillBeMember<EventPath> m_eventPath;
|
| + Member<Event> m_underlyingEvent;
|
| + Member<EventPath> m_eventPath;
|
| // The monotonic platform time in seconds, for input events it is the
|
| // event timestamp provided by the host OS and reported in the original
|
| // WebInputEvent instance.
|
|
|