Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/events/CompositionEvent.h b/src/third_party/WebKit/Source/core/events/CompositionEvent.h
index c3e0323..93e2979 100644 (file)
--- a/src/third_party/WebKit/Source/core/events/CompositionEvent.h
+++ b/src/third_party/WebKit/Source/core/events/CompositionEvent.h
@@ -30,7 +30,7 @@
 #include "core/editing/CompositionUnderline.h"
 #include "core/events/UIEvent.h"
 
-namespace WebCore {
+namespace blink {
 
 struct CompositionEventInit : UIEventInit {
     CompositionEventInit();
@@ -40,29 +40,24 @@ struct CompositionEventInit : UIEventInit {
 
 class CompositionEvent FINAL : public UIEvent {
 public:
-    static PassRefPtr<CompositionEvent> create()
+    static PassRefPtrWillBeRawPtr<CompositionEvent> create()
     {
-        return adoptRef(new CompositionEvent);
+        return adoptRefWillBeNoop(new CompositionEvent);
     }
 
-    static PassRefPtr<CompositionEvent> create(const AtomicString& type, PassRefPtr<AbstractView> view, const String& data)
+    static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view, const String& data, const Vector<CompositionUnderline>& underlines)
     {
-        return adoptRef(new CompositionEvent(type, view, data));
+        return adoptRefWillBeNoop(new CompositionEvent(type, view, data, underlines));
     }
 
-    static PassRefPtr<CompositionEvent> create(const AtomicString& type, PassRefPtr<AbstractView> view, const String& data, const Vector<CompositionUnderline>& underlines)
+    static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& type, const CompositionEventInit& initializer)
     {
-        return adoptRef(new CompositionEvent(type, view, data, underlines));
-    }
-
-    static PassRefPtr<CompositionEvent> create(const AtomicString& type, const CompositionEventInit& initializer)
-    {
-        return adoptRef(new CompositionEvent(type, initializer));
+        return adoptRefWillBeNoop(new CompositionEvent(type, initializer));
     }
 
     virtual ~CompositionEvent();
 
-    void initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView>, const String& data);
+    void initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView>, const String& data);
 
     String data() const { return m_data; }
     int activeSegmentStart() const { return m_activeSegmentStart; }
@@ -71,10 +66,11 @@ public:
 
     virtual const AtomicString& interfaceName() const OVERRIDE;
 
+    virtual void trace(Visitor*) OVERRIDE;
+
 private:
     CompositionEvent();
-    CompositionEvent(const AtomicString& type, PassRefPtr<AbstractView>, const String&);
-    CompositionEvent(const AtomicString& type, PassRefPtr<AbstractView>, const String&, const Vector<CompositionUnderline>& underlines);
+    CompositionEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView>, const String&, const Vector<CompositionUnderline>& underlines);
     CompositionEvent(const AtomicString& type, const CompositionEventInit&);
     void initializeSegments(const Vector<CompositionUnderline>* = 0);
 
@@ -84,6 +80,6 @@ private:
     Vector<unsigned> m_segments;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // CompositionEvent_h