Chromium Code Reviews| Index: Source/modules/webmidi/MIDIMessageEvent.h |
| diff --git a/Source/modules/websockets/CloseEvent.h b/Source/modules/webmidi/MIDIMessageEvent.h |
| similarity index 53% |
| copy from Source/modules/websockets/CloseEvent.h |
| copy to Source/modules/webmidi/MIDIMessageEvent.h |
| index ba362cf1d09e6a44c1c0ee8889471fbf107f2602..00baf8833fe0c39807b20a50b1ab07b49ab3b4ec 100644 |
| --- a/Source/modules/websockets/CloseEvent.h |
| +++ b/Source/modules/webmidi/MIDIMessageEvent.h |
| @@ -1,5 +1,5 @@ |
| /* |
| - * Copyright (C) 2011 Google Inc. All rights reserved. |
| + * Copyright (C) 2013 Google Inc. All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions are |
| @@ -28,82 +28,70 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef CloseEvent_h |
| -#define CloseEvent_h |
| +#ifndef MIDIMessageEvent_h |
| +#define MIDIMessageEvent_h |
| #include "Event.h" |
| -#include "EventNames.h" |
| +#include <wtf/Uint8Array.h> |
| namespace WebCore { |
| -struct CloseEventInit : public EventInit { |
| - CloseEventInit() |
| - : wasClean(false) |
| - , code(0) |
| +struct MIDIMessageEventInit : public EventInit { |
| + MIDIMessageEventInit() |
| + : receivedTime(0.0) |
| { |
| }; |
| - bool wasClean; |
| - unsigned short code; |
| - String reason; |
| + double receivedTime; |
| + RefPtr<Uint8Array> data; |
| }; |
| -class CloseEvent : public Event { |
| +class MIDIMessageEvent : public Event { |
| public: |
| - static PassRefPtr<CloseEvent> create() |
| + static PassRefPtr<MIDIMessageEvent> create() |
| { |
| - return adoptRef(new CloseEvent()); |
| + return adoptRef(new MIDIMessageEvent()); |
| } |
| - static PassRefPtr<CloseEvent> create(bool wasClean, unsigned short code, const String& reason) |
| + static PassRefPtr<MIDIMessageEvent> create(double receivedTime, RefPtr<Uint8Array> data) |
|
Chris Rogers
2013/04/22 19:31:57
RefPtr -> PassRefPtr?
Takashi Toyoshima
2013/04/23 04:24:46
Done.
|
| { |
| - return adoptRef(new CloseEvent(wasClean, code, reason)); |
| + return adoptRef(new MIDIMessageEvent(receivedTime, data)); |
| } |
| - static PassRefPtr<CloseEvent> create(const AtomicString& type, const CloseEventInit& initializer) |
| + static PassRefPtr<MIDIMessageEvent> create(const AtomicString& type, const MIDIMessageEventInit& initializer) |
| { |
| - return adoptRef(new CloseEvent(type, initializer)); |
| + return adoptRef(new MIDIMessageEvent(type, initializer)); |
| } |
| - bool wasClean() const { return m_wasClean; } |
| - unsigned short code() const { return m_code; } |
| - String reason() const { return m_reason; } |
| - |
| - // Event function. |
| - virtual const AtomicString& interfaceName() const OVERRIDE { return eventNames().interfaceForCloseEvent; } |
| + double receivedTime() { return m_receivedTime; } |
| + RefPtr<Uint8Array> data() { return m_data; } |
|
Chris Rogers
2013/04/22 19:31:57
Seems like this could be PassRefPtr? Adam?
abarth-chromium
2013/04/22 19:33:04
Yes.
Takashi Toyoshima
2013/04/23 04:24:46
Done.
|
| private: |
| - CloseEvent() |
| - : Event(eventNames().closeEvent, false, false) |
| - , m_wasClean(false) |
| - , m_code(0) |
| + MIDIMessageEvent() |
| + : m_receivedTime(0.0) |
| { |
| ScriptWrappable::init(this); |
| } |
| - CloseEvent(bool wasClean, int code, const String& reason) |
| - : Event(eventNames().closeEvent, false, false) |
| - , m_wasClean(wasClean) |
| - , m_code(code) |
| - , m_reason(reason) |
| + MIDIMessageEvent(double receivedTime, RefPtr<Uint8Array> data) |
|
Chris Rogers
2013/04/22 19:31:57
RefPtr -> PassRefPtr?
Takashi Toyoshima
2013/04/23 04:24:46
Done.
|
| + : m_receivedTime(receivedTime) |
| + , m_data(data) |
| { |
| ScriptWrappable::init(this); |
| } |
| - CloseEvent(const AtomicString& type, const CloseEventInit& initializer) |
| + MIDIMessageEvent(const AtomicString& type, const MIDIMessageEventInit& initializer) |
| : Event(type, initializer) |
| - , m_wasClean(initializer.wasClean) |
| - , m_code(initializer.code) |
| - , m_reason(initializer.reason) |
| + , m_receivedTime(initializer.receivedTime) |
| + , m_data(initializer.data) |
| { |
| ScriptWrappable::init(this); |
| } |
| - bool m_wasClean; |
| - unsigned short m_code; |
| - String m_reason; |
| + double m_receivedTime; |
| + RefPtr<Uint8Array> m_data; |
| }; |
| } // namespace WebCore |
| -#endif // CloseEvent_h |
| +#endif // MIDIMessageEvent_h |