Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: third_party/WebKit/Source/modules/webmidi/MIDIController.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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>
36 35
37 namespace blink { 36 namespace blink {
38 37
39 const char* MIDIController::supplementName() 38 const char* MIDIController::supplementName()
40 { 39 {
41 return "MIDIController"; 40 return "MIDIController";
42 } 41 }
43 42
44 MIDIController::MIDIController(std::unique_ptr<MIDIClient> client) 43 MIDIController::MIDIController(PassOwnPtr<MIDIClient> client)
45 : m_client(std::move(client)) 44 : m_client(std::move(client))
46 { 45 {
47 DCHECK(m_client); 46 DCHECK(m_client);
48 } 47 }
49 48
50 MIDIController::~MIDIController() 49 MIDIController::~MIDIController()
51 { 50 {
52 } 51 }
53 52
54 MIDIController* MIDIController::create(std::unique_ptr<MIDIClient> client) 53 MIDIController* MIDIController::create(PassOwnPtr<MIDIClient> client)
55 { 54 {
56 return new MIDIController(std::move(client)); 55 return new MIDIController(std::move(client));
57 } 56 }
58 57
59 void MIDIController::requestPermission(MIDIAccessInitializer* initializer, const MIDIOptions& options) 58 void MIDIController::requestPermission(MIDIAccessInitializer* initializer, const MIDIOptions& options)
60 { 59 {
61 m_client->requestPermission(initializer, options); 60 m_client->requestPermission(initializer, options);
62 } 61 }
63 62
64 void MIDIController::cancelPermissionRequest(MIDIAccessInitializer* initializer) 63 void MIDIController::cancelPermissionRequest(MIDIAccessInitializer* initializer)
65 { 64 {
66 m_client->cancelPermissionRequest(initializer); 65 m_client->cancelPermissionRequest(initializer);
67 } 66 }
68 67
69 void provideMIDITo(LocalFrame& frame, std::unique_ptr<MIDIClient> client) 68 void provideMIDITo(LocalFrame& frame, PassOwnPtr<MIDIClient> client)
70 { 69 {
71 MIDIController::provideTo(frame, MIDIController::supplementName(), MIDIContr oller::create(std::move(client))); 70 MIDIController::provideTo(frame, MIDIController::supplementName(), MIDIContr oller::create(std::move(client)));
72 } 71 }
73 72
74 } // namespace blink 73 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698