Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / encryptedmedia / MediaKeyMessageEvent.h

diff --git a/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeyMessageEvent.h b/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeyMessageEvent.h
index 35eb09b..6573179 100644 (file)
--- a/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeyMessageEvent.h
+++ b/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeyMessageEvent.h
@@ -27,8 +27,6 @@
 #ifndef MediaKeyMessageEvent_h
 #define MediaKeyMessageEvent_h
 
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-
 #include "core/events/Event.h"
 #include "core/html/MediaKeyError.h"
 
@@ -41,18 +39,18 @@ struct MediaKeyMessageEventInit : public EventInit {
     String destinationURL;
 };
 
-class MediaKeyMessageEvent : public Event {
+class MediaKeyMessageEvent FINAL : public Event {
 public:
     virtual ~MediaKeyMessageEvent();
 
-    static PassRefPtr<MediaKeyMessageEvent> create()
+    static PassRefPtrWillBeRawPtr<MediaKeyMessageEvent> create()
     {
-        return adoptRef(new MediaKeyMessageEvent);
+        return adoptRefWillBeNoop(new MediaKeyMessageEvent);
     }
 
-    static PassRefPtr<MediaKeyMessageEvent> create(const AtomicString& type, const MediaKeyMessageEventInit& initializer)
+    static PassRefPtrWillBeRawPtr<MediaKeyMessageEvent> create(const AtomicString& type, const MediaKeyMessageEventInit& initializer)
     {
-        return adoptRef(new MediaKeyMessageEvent(type, initializer));
+        return adoptRefWillBeNoop(new MediaKeyMessageEvent(type, initializer));
     }
 
     virtual const AtomicString& interfaceName() const OVERRIDE;
@@ -60,6 +58,8 @@ public:
     Uint8Array* message() const { return m_message.get(); }
     String destinationURL() const { return m_destinationURL; }
 
+    virtual void trace(Visitor*) OVERRIDE;
+
 private:
     MediaKeyMessageEvent();
     MediaKeyMessageEvent(const AtomicString& type, const MediaKeyMessageEventInit& initializer);
@@ -71,4 +71,3 @@ private:
 } // namespace WebCore
 
 #endif
-#endif