diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/events/UIEvent.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/events/UIEvent.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/chromium/third_party/WebKit/Source/core/events/UIEvent.h b/chromium/third_party/WebKit/Source/core/events/UIEvent.h index 27503311307..48935975ab0 100644 --- a/chromium/third_party/WebKit/Source/core/events/UIEvent.h +++ b/chromium/third_party/WebKit/Source/core/events/UIEvent.h @@ -26,43 +26,43 @@ #include "core/events/Event.h" #include "core/events/EventDispatchMediator.h" -#include "core/frame/DOMWindow.h" +#include "core/frame/LocalDOMWindow.h" namespace WebCore { -typedef DOMWindow AbstractView; +typedef LocalDOMWindow AbstractView; struct UIEventInit : public EventInit { UIEventInit(); - RefPtr<AbstractView> view; + RefPtrWillBeMember<AbstractView> view; int detail; }; class UIEvent : public Event { public: - static PassRefPtr<UIEvent> create() + static PassRefPtrWillBeRawPtr<UIEvent> create() { - return adoptRef(new UIEvent); + return adoptRefWillBeNoop(new UIEvent); } - static PassRefPtr<UIEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView> view, int detail) + static PassRefPtrWillBeRawPtr<UIEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView> view, int detail) { - return adoptRef(new UIEvent(type, canBubble, cancelable, view, detail)); + return adoptRefWillBeNoop(new UIEvent(type, canBubble, cancelable, view, detail)); } - static PassRefPtr<UIEvent> create(const AtomicString& type, const UIEventInit& initializer) + static PassRefPtrWillBeRawPtr<UIEvent> create(const AtomicString& type, const UIEventInit& initializer) { - return adoptRef(new UIEvent(type, initializer)); + return adoptRefWillBeNoop(new UIEvent(type, initializer)); } virtual ~UIEvent(); - void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView>, int detail); + void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView>, int detail); AbstractView* view() const { return m_view.get(); } AbstractView* view(bool& isNull) const { isNull = !m_view; return m_view.get(); } int detail() const { return m_detail; } - virtual const AtomicString& interfaceName() const; - virtual bool isUIEvent() const; + virtual const AtomicString& interfaceName() const OVERRIDE; + virtual bool isUIEvent() const OVERRIDE FINAL; virtual int keyCode() const; virtual int charCode() const; @@ -75,13 +75,15 @@ public: virtual int which() const; + virtual void trace(Visitor*) OVERRIDE; + protected: UIEvent(); - UIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView>, int detail); + UIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView>, int detail); UIEvent(const AtomicString&, const UIEventInit&); private: - RefPtr<AbstractView> m_view; + RefPtrWillBeMember<AbstractView> m_view; int m_detail; }; |