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 14 matching lines...) Expand all Loading... | |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #ifndef NavigatorWebMIDI_h | 31 #ifndef NavigatorWebMIDI_h |
32 #define NavigatorWebMIDI_h | 32 #define NavigatorWebMIDI_h |
33 | 33 |
34 #include "core/frame/DOMWindowProperty.h" | 34 #include "core/frame/DOMWindowProperty.h" |
35 #include "heap/Handle.h" | |
35 #include "modules/webmidi/MIDIOptions.h" | 36 #include "modules/webmidi/MIDIOptions.h" |
36 #include "platform/Supplementable.h" | 37 #include "platform/Supplementable.h" |
37 | 38 |
38 namespace WebCore { | 39 namespace WebCore { |
39 | 40 |
40 class MIDIAccessPromise; | 41 class MIDIAccessPromise; |
41 class Navigator; | 42 class Navigator; |
42 | 43 |
43 class NavigatorWebMIDI FINAL : public Supplement<Navigator>, public DOMWindowPro perty { | 44 class NavigatorWebMIDI FINAL : public NoBaseWillBeGarbageCollectedFinalized<Navi gatorWebMIDI>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty { |
45 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorWebMIDI); | |
44 public: | 46 public: |
45 virtual ~NavigatorWebMIDI(); | 47 virtual ~NavigatorWebMIDI(); |
46 static NavigatorWebMIDI& from(Navigator&); | 48 static NavigatorWebMIDI& from(Navigator&); |
47 | 49 |
48 static PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(Navigator &, const Dictionary&); | 50 static PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(Navigator &, const Dictionary&); |
49 PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(const Dictionary &); | 51 PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(const Dictionary &); |
50 | 52 |
53 virtual void trace(Visitor*) { } | |
haraken
2014/03/19 04:02:36
Drop virtual.
| |
54 | |
51 private: | 55 private: |
52 NavigatorWebMIDI(LocalFrame*); | 56 NavigatorWebMIDI(LocalFrame*); |
53 static const char* supplementName(); | 57 static const char* supplementName(); |
54 }; | 58 }; |
55 | 59 |
56 } // namespace WebCore | 60 } // namespace WebCore |
57 | 61 |
58 #endif // NavigatorWebMIDI_h | 62 #endif // NavigatorWebMIDI_h |
OLD | NEW |