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 23 matching lines...) Expand all Loading... | |
34 #include "modules/webmidi/MIDIAccess.h" | 34 #include "modules/webmidi/MIDIAccess.h" |
35 #include "modules/webmidi/MIDIClient.h" | 35 #include "modules/webmidi/MIDIClient.h" |
36 | 36 |
37 namespace WebCore { | 37 namespace WebCore { |
38 | 38 |
39 const char* MIDIController::supplementName() | 39 const char* MIDIController::supplementName() |
40 { | 40 { |
41 return "MIDIController"; | 41 return "MIDIController"; |
42 } | 42 } |
43 | 43 |
44 MIDIController::MIDIController(MIDIClient* client) | 44 MIDIController::MIDIController(PassOwnPtr<MIDIClient> client) |
45 : m_client(client) | 45 : m_client(client) |
46 { | 46 { |
47 ASSERT(client); | 47 ASSERT(m_client); |
gyuyoung-inactive
2014/04/03 06:30:11
I missed that client becomes a null after passing
| |
48 } | 48 } |
49 | 49 |
50 MIDIController::~MIDIController() | 50 MIDIController::~MIDIController() |
51 { | 51 { |
52 } | 52 } |
53 | 53 |
54 PassOwnPtr<MIDIController> MIDIController::create(MIDIClient* client) | 54 PassOwnPtr<MIDIController> MIDIController::create(PassOwnPtr<MIDIClient> client) |
55 { | 55 { |
56 return adoptPtr(new MIDIController(client)); | 56 return adoptPtr(new MIDIController(client)); |
57 } | 57 } |
58 | 58 |
59 void MIDIController::requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess> a ccess) | 59 void MIDIController::requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess> a ccess) |
60 { | 60 { |
61 m_client->requestSysexPermission(access); | 61 m_client->requestSysexPermission(access); |
62 } | 62 } |
63 | 63 |
64 void MIDIController::cancelSysexPermissionRequest(MIDIAccess* access) | 64 void MIDIController::cancelSysexPermissionRequest(MIDIAccess* access) |
65 { | 65 { |
66 m_client->cancelSysexPermissionRequest(access); | 66 m_client->cancelSysexPermissionRequest(access); |
67 } | 67 } |
68 | 68 |
69 void provideMIDITo(Page& page, MIDIClient* client) | 69 void provideMIDITo(Page& page, PassOwnPtr<MIDIClient> client) |
70 { | 70 { |
71 MIDIController::provideTo(page, MIDIController::supplementName(), MIDIContro ller::create(client)); | 71 MIDIController::provideTo(page, MIDIController::supplementName(), MIDIContro ller::create(client)); |
72 } | 72 } |
73 | 73 |
74 } // namespace WebCore | 74 } // namespace WebCore |
OLD | NEW |