OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 24 matching lines...) Expand all Loading... | |
35 #include "modules/webmidi/MIDIPort.h" | 35 #include "modules/webmidi/MIDIPort.h" |
36 | 36 |
37 namespace WebCore { | 37 namespace WebCore { |
38 | 38 |
39 struct MIDIConnectionEventInit : public EventInit { | 39 struct MIDIConnectionEventInit : public EventInit { |
40 MIDIConnectionEventInit() | 40 MIDIConnectionEventInit() |
41 : port(nullptr) | 41 : port(nullptr) |
42 { | 42 { |
43 }; | 43 }; |
44 | 44 |
45 RefPtr<MIDIPort> port; | 45 RefPtr<MIDIPort> port; |
sof
2014/06/02 12:41:03
Should this be RefPtrWillBeMember? (Dictionary.h n
zerny-chromium
2014/06/02 13:06:49
I'd rather postpone that to a CL that completes th
sof
2014/06/02 13:11:19
I'm fine with scoping this CL to that only, and de
| |
46 }; | 46 }; |
47 | 47 |
48 class MIDIConnectionEvent FINAL : public Event { | 48 class MIDIConnectionEvent FINAL : public Event { |
sof
2014/06/02 12:41:03
I think this event merits a .cpp file of its own b
zerny-chromium
2014/06/02 13:06:49
Ok. I'll add one.
| |
49 public: | 49 public: |
50 static PassRefPtrWillBeRawPtr<MIDIConnectionEvent> create() | 50 static PassRefPtrWillBeRawPtr<MIDIConnectionEvent> create() |
51 { | 51 { |
52 return adoptRefWillBeNoop(new MIDIConnectionEvent()); | 52 return adoptRefWillBeNoop(new MIDIConnectionEvent()); |
53 } | 53 } |
54 | 54 |
55 static PassRefPtrWillBeRawPtr<MIDIConnectionEvent> create(const AtomicString & type, PassRefPtr<MIDIPort> port) | 55 static PassRefPtrWillBeRawPtr<MIDIConnectionEvent> create(const AtomicString & type, PassRefPtrWillBeRawPtr<MIDIPort> port) |
56 { | 56 { |
57 return adoptRefWillBeNoop(new MIDIConnectionEvent(type, port)); | 57 return adoptRefWillBeNoop(new MIDIConnectionEvent(type, port)); |
58 } | 58 } |
59 | 59 |
60 static PassRefPtrWillBeRawPtr<MIDIConnectionEvent> create(const AtomicString & type, const MIDIConnectionEventInit& initializer) | 60 static PassRefPtrWillBeRawPtr<MIDIConnectionEvent> create(const AtomicString & type, const MIDIConnectionEventInit& initializer) |
61 { | 61 { |
62 return adoptRefWillBeNoop(new MIDIConnectionEvent(type, initializer)); | 62 return adoptRefWillBeNoop(new MIDIConnectionEvent(type, initializer)); |
63 } | 63 } |
64 | 64 |
65 RefPtr<MIDIPort> port() { return m_port; } | 65 PassRefPtrWillBeRawPtr<MIDIPort> port() { return m_port; } |
66 | 66 |
67 virtual const AtomicString& interfaceName() const OVERRIDE { return EventNam es::MIDIConnectionEvent; } | 67 virtual const AtomicString& interfaceName() const OVERRIDE { return EventNam es::MIDIConnectionEvent; } |
68 | 68 |
69 virtual void trace(Visitor* visitor) OVERRIDE { Event::trace(visitor); } | 69 virtual void trace(Visitor* visitor) OVERRIDE |
sof
2014/06/02 12:41:03
Move the definition the .cpp file?
zerny-chromium
2014/06/02 13:06:49
Done.
| |
70 { | |
71 visitor->trace(m_port); | |
72 Event::trace(visitor); | |
73 } | |
70 | 74 |
71 private: | 75 private: |
72 MIDIConnectionEvent() | 76 MIDIConnectionEvent() |
73 { | 77 { |
74 ScriptWrappable::init(this); | 78 ScriptWrappable::init(this); |
75 } | 79 } |
76 | 80 |
77 MIDIConnectionEvent(const AtomicString& type, PassRefPtr<MIDIPort> port) | 81 MIDIConnectionEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<MIDIPor t> port) |
78 : Event(type, false, false) | 82 : Event(type, false, false) |
79 , m_port(port) | 83 , m_port(port) |
80 { | 84 { |
81 ScriptWrappable::init(this); | 85 ScriptWrappable::init(this); |
82 } | 86 } |
83 | 87 |
84 MIDIConnectionEvent(const AtomicString& type, const MIDIConnectionEventInit& initializer) | 88 MIDIConnectionEvent(const AtomicString& type, const MIDIConnectionEventInit& initializer) |
85 : Event(type, initializer) | 89 : Event(type, initializer) |
86 , m_port(initializer.port) | 90 , m_port(initializer.port) |
87 { | 91 { |
88 ScriptWrappable::init(this); | 92 ScriptWrappable::init(this); |
89 } | 93 } |
90 | 94 |
91 RefPtr<MIDIPort> m_port; | 95 RefPtrWillBeMember<MIDIPort> m_port; |
92 }; | 96 }; |
93 | 97 |
94 } // namespace WebCore | 98 } // namespace WebCore |
95 | 99 |
96 #endif // MIDIConnectionEvent_h | 100 #endif // MIDIConnectionEvent_h |
OLD | NEW |