| 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 15 matching lines...) Expand all Loading... |
| 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/frame/LocalFrame.h" | 34 #include "core/frame/LocalFrame.h" |
| 35 #include "platform/heap/Handle.h" | 35 #include "platform/heap/Handle.h" |
| 36 #include <memory> |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 class MIDIAccessInitializer; | 40 class MIDIAccessInitializer; |
| 40 class MIDIClient; | 41 class MIDIClient; |
| 41 class MIDIOptions; | 42 class MIDIOptions; |
| 42 | 43 |
| 43 class MIDIController final : public GarbageCollectedFinalized<MIDIController>, p
ublic Supplement<LocalFrame> { | 44 class MIDIController final : public GarbageCollectedFinalized<MIDIController>, p
ublic Supplement<LocalFrame> { |
| 44 USING_GARBAGE_COLLECTED_MIXIN(MIDIController); | 45 USING_GARBAGE_COLLECTED_MIXIN(MIDIController); |
| 45 public: | 46 public: |
| 46 virtual ~MIDIController(); | 47 virtual ~MIDIController(); |
| 47 | 48 |
| 48 void requestPermission(MIDIAccessInitializer*, const MIDIOptions&); | 49 void requestPermission(MIDIAccessInitializer*, const MIDIOptions&); |
| 49 void cancelPermissionRequest(MIDIAccessInitializer*); | 50 void cancelPermissionRequest(MIDIAccessInitializer*); |
| 50 | 51 |
| 51 static MIDIController* create(PassOwnPtr<MIDIClient>); | 52 static MIDIController* create(std::unique_ptr<MIDIClient>); |
| 52 static const char* supplementName(); | 53 static const char* supplementName(); |
| 53 static MIDIController* from(LocalFrame* frame) { return static_cast<MIDICont
roller*>(Supplement<LocalFrame>::from(frame, supplementName())); } | 54 static MIDIController* from(LocalFrame* frame) { return static_cast<MIDICont
roller*>(Supplement<LocalFrame>::from(frame, supplementName())); } |
| 54 | 55 |
| 55 DEFINE_INLINE_VIRTUAL_TRACE() { Supplement<LocalFrame>::trace(visitor); } | 56 DEFINE_INLINE_VIRTUAL_TRACE() { Supplement<LocalFrame>::trace(visitor); } |
| 56 | 57 |
| 57 protected: | 58 protected: |
| 58 explicit MIDIController(PassOwnPtr<MIDIClient>); | 59 explicit MIDIController(std::unique_ptr<MIDIClient>); |
| 59 | 60 |
| 60 private: | 61 private: |
| 61 OwnPtr<MIDIClient> m_client; | 62 std::unique_ptr<MIDIClient> m_client; |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 } // namespace blink | 65 } // namespace blink |
| 65 | 66 |
| 66 #endif // MIDIController_h | 67 #endif // MIDIController_h |
| OLD | NEW |