Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / events / UIEvent.h

diff --git a/src/third_party/WebKit/Source/core/events/UIEvent.h b/src/third_party/WebKit/Source/core/events/UIEvent.h
index b0d3844..da0a2b2 100644 (file)
--- a/src/third_party/WebKit/Source/core/events/UIEvent.h
+++ b/src/third_party/WebKit/Source/core/events/UIEvent.h
@@ -26,39 +26,38 @@
 
 #include "core/events/Event.h"
 #include "core/events/EventDispatchMediator.h"
-#include "core/frame/DOMWindow.h"
+#include "core/frame/LocalDOMWindow.h"
 
-namespace WebCore {
+namespace blink {
 
-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 OVERRIDE;
@@ -75,16 +74,18 @@ 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;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // UIEvent_h