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 13 matching lines...) Expand all Loading... | |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
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 MIDIController_h | 31 #ifndef MIDIController_h |
32 #define MIDIController_h | 32 #define MIDIController_h |
33 | 33 |
34 #include "core/page/Page.h" | 34 #include "core/frame/LocalFrame.h" |
35 #include "platform/heap/Handle.h" | 35 #include "platform/heap/Handle.h" |
36 | 36 |
37 namespace WebCore { | 37 namespace WebCore { |
38 | 38 |
39 class MIDIAccess; | 39 class MIDIAccess; |
40 class MIDIClient; | 40 class MIDIClient; |
41 | 41 |
42 class MIDIController FINAL : public NoBaseWillBeGarbageCollectedFinalized<MIDICo ntroller>, public WillBeHeapSupplement<Page> { | 42 class MIDIController FINAL : public Supplement<LocalFrame> { |
43 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MIDIController); | |
44 public: | 43 public: |
45 virtual ~MIDIController(); | 44 virtual ~MIDIController(); |
46 | 45 |
47 void requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess>); | 46 void requestSysexPermission(PassRefPtr<MIDIAccess>); |
sof
2014/06/06 20:13:03
Why this change? MIDIAccess is still a GCed object
jam
2014/06/06 20:38:29
oh, I misunderstood and thought that it should be
| |
48 void cancelSysexPermissionRequest(MIDIAccess*); | 47 void cancelSysexPermissionRequest(MIDIAccess*); |
49 | 48 |
50 static PassOwnPtrWillBeRawPtr<MIDIController> create(PassOwnPtr<MIDIClient>) ; | 49 static PassOwnPtr<MIDIController> create(PassOwnPtr<MIDIClient>); |
51 static const char* supplementName(); | 50 static const char* supplementName(); |
52 static MIDIController* from(Page* page) { return static_cast<MIDIController* >(WillBeHeapSupplement<Page>::from(page, supplementName())); } | 51 static MIDIController* from(LocalFrame* frame) { return static_cast<MIDICont roller*>(Supplement<LocalFrame>::from(frame, supplementName())); } |
53 | 52 |
54 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); } | 53 virtual void trace(Visitor* visitor) OVERRIDE { Supplement<LocalFrame>::trac e(visitor); } |
55 | 54 |
56 protected: | 55 protected: |
57 explicit MIDIController(PassOwnPtr<MIDIClient>); | 56 explicit MIDIController(PassOwnPtr<MIDIClient>); |
58 | 57 |
59 private: | 58 private: |
60 OwnPtr<MIDIClient> m_client; | 59 OwnPtr<MIDIClient> m_client; |
61 }; | 60 }; |
62 | 61 |
63 } // namespace WebCore | 62 } // namespace WebCore |
64 | 63 |
65 #endif // MIDIController_h | 64 #endif // MIDIController_h |
OLD | NEW |