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 #include "modules/webmidi/MIDIController.h" | 31 #include "modules/webmidi/MIDIController.h" |
32 | 32 |
33 #include "modules/webmidi/MIDIAccessInitializer.h" | 33 #include "modules/webmidi/MIDIAccessInitializer.h" |
34 #include "modules/webmidi/MIDIClient.h" | 34 #include "modules/webmidi/MIDIClient.h" |
| 35 #include <memory> |
35 | 36 |
36 namespace blink { | 37 namespace blink { |
37 | 38 |
38 const char* MIDIController::supplementName() | 39 const char* MIDIController::supplementName() |
39 { | 40 { |
40 return "MIDIController"; | 41 return "MIDIController"; |
41 } | 42 } |
42 | 43 |
43 MIDIController::MIDIController(PassOwnPtr<MIDIClient> client) | 44 MIDIController::MIDIController(std::unique_ptr<MIDIClient> client) |
44 : m_client(std::move(client)) | 45 : m_client(std::move(client)) |
45 { | 46 { |
46 DCHECK(m_client); | 47 DCHECK(m_client); |
47 } | 48 } |
48 | 49 |
49 MIDIController::~MIDIController() | 50 MIDIController::~MIDIController() |
50 { | 51 { |
51 } | 52 } |
52 | 53 |
53 MIDIController* MIDIController::create(PassOwnPtr<MIDIClient> client) | 54 MIDIController* MIDIController::create(std::unique_ptr<MIDIClient> client) |
54 { | 55 { |
55 return new MIDIController(std::move(client)); | 56 return new MIDIController(std::move(client)); |
56 } | 57 } |
57 | 58 |
58 void MIDIController::requestPermission(MIDIAccessInitializer* initializer, const
MIDIOptions& options) | 59 void MIDIController::requestPermission(MIDIAccessInitializer* initializer, const
MIDIOptions& options) |
59 { | 60 { |
60 m_client->requestPermission(initializer, options); | 61 m_client->requestPermission(initializer, options); |
61 } | 62 } |
62 | 63 |
63 void MIDIController::cancelPermissionRequest(MIDIAccessInitializer* initializer) | 64 void MIDIController::cancelPermissionRequest(MIDIAccessInitializer* initializer) |
64 { | 65 { |
65 m_client->cancelPermissionRequest(initializer); | 66 m_client->cancelPermissionRequest(initializer); |
66 } | 67 } |
67 | 68 |
68 void provideMIDITo(LocalFrame& frame, PassOwnPtr<MIDIClient> client) | 69 void provideMIDITo(LocalFrame& frame, std::unique_ptr<MIDIClient> client) |
69 { | 70 { |
70 MIDIController::provideTo(frame, MIDIController::supplementName(), MIDIContr
oller::create(std::move(client))); | 71 MIDIController::provideTo(frame, MIDIController::supplementName(), MIDIContr
oller::create(std::move(client))); |
71 } | 72 } |
72 | 73 |
73 } // namespace blink | 74 } // namespace blink |
OLD | NEW |