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

Side by Side Diff: third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h

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 16 matching lines...) Expand all
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 MIDIAccessor_h 31 #ifndef MIDIAccessor_h
32 #define MIDIAccessor_h 32 #define MIDIAccessor_h
33 33
34 #include "public/platform/modules/webmidi/WebMIDIAccessor.h" 34 #include "public/platform/modules/webmidi/WebMIDIAccessor.h"
35 #include "public/platform/modules/webmidi/WebMIDIAccessorClient.h" 35 #include "public/platform/modules/webmidi/WebMIDIAccessorClient.h"
36 #include "wtf/Allocator.h" 36 #include "wtf/Allocator.h"
37 #include <memory> 37 #include "wtf/OwnPtr.h"
38 #include "wtf/PassOwnPtr.h"
38 39
39 namespace blink { 40 namespace blink {
40 41
41 class MIDIAccessorClient; 42 class MIDIAccessorClient;
42 43
43 class MIDIAccessor final : public WebMIDIAccessorClient { 44 class MIDIAccessor final : public WebMIDIAccessorClient {
44 USING_FAST_MALLOC(MIDIAccessor); 45 USING_FAST_MALLOC(MIDIAccessor);
45 public: 46 public:
46 static std::unique_ptr<MIDIAccessor> create(MIDIAccessorClient*); 47 static PassOwnPtr<MIDIAccessor> create(MIDIAccessorClient*);
47 48
48 ~MIDIAccessor() override { } 49 ~MIDIAccessor() override { }
49 50
50 void startSession(); 51 void startSession();
51 void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t leng th, double timeStamp); 52 void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t leng th, double timeStamp);
52 // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient. 53 // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient.
53 // MIDIAccessInitializer is the first client and MIDIAccess takes over it 54 // MIDIAccessInitializer is the first client and MIDIAccess takes over it
54 // once the initialization successfully finishes. 55 // once the initialization successfully finishes.
55 void setClient(MIDIAccessorClient* client) { m_client = client; } 56 void setClient(MIDIAccessorClient* client) { m_client = client; }
56 57
57 // WebMIDIAccessorClient 58 // WebMIDIAccessorClient
58 void didAddInputPort(const WebString& id, const WebString& manufacturer, con st WebString& name, const WebString& version, MIDIPortState) override; 59 void didAddInputPort(const WebString& id, const WebString& manufacturer, con st WebString& name, const WebString& version, MIDIPortState) override;
59 void didAddOutputPort(const WebString& id, const WebString& manufacturer, co nst WebString& name, const WebString& version, MIDIPortState) override; 60 void didAddOutputPort(const WebString& id, const WebString& manufacturer, co nst WebString& name, const WebString& version, MIDIPortState) override;
60 void didSetInputPortState(unsigned portIndex, MIDIPortState) override; 61 void didSetInputPortState(unsigned portIndex, MIDIPortState) override;
61 void didSetOutputPortState(unsigned portIndex, MIDIPortState) override; 62 void didSetOutputPortState(unsigned portIndex, MIDIPortState) override;
62 void didStartSession(bool success, const WebString& error, const WebString& message) override; 63 void didStartSession(bool success, const WebString& error, const WebString& message) override;
63 void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_ t length, double timeStamp) override; 64 void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_ t length, double timeStamp) override;
64 65
65 private: 66 private:
66 explicit MIDIAccessor(MIDIAccessorClient*); 67 explicit MIDIAccessor(MIDIAccessorClient*);
67 68
68 MIDIAccessorClient* m_client; 69 MIDIAccessorClient* m_client;
69 std::unique_ptr<WebMIDIAccessor> m_accessor; 70 OwnPtr<WebMIDIAccessor> m_accessor;
70 }; 71 };
71 72
72 } // namespace blink 73 } // namespace blink
73 74
74 #endif // MIDIAccessor_h 75 #endif // MIDIAccessor_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698