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

Side by Side Diff: Source/modules/webmidi/MIDIController.h

Issue 317413003: Move MIDI code to hang off WebFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/modules/webmidi/MIDIClient.h ('k') | Source/modules/webmidi/MIDIController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 #ifndef MIDIController_h 31 #ifndef MIDIController_h
32 #define MIDIController_h 32 #define MIDIController_h
33 33
34 #include "core/page/Page.h" 34 #include "core/frame/LocalFrame.h"
35 #include "platform/heap/Handle.h" 35 #include "platform/heap/Handle.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 class MIDIAccess; 39 class MIDIAccess;
40 class MIDIClient; 40 class MIDIClient;
41 41
42 class MIDIController FINAL : public NoBaseWillBeGarbageCollectedFinalized<MIDICo ntroller>, public WillBeHeapSupplement<Page> { 42 class MIDIController FINAL : public NoBaseWillBeGarbageCollectedFinalized<MIDICo ntroller>, public WillBeHeapSupplement<LocalFrame> {
jam 2014/06/06 18:23:52 not sure if I need to remove all the oilpan stuff
sof 2014/06/06 19:32:55 That's right (for now.) Consequently, simplify thi
43 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MIDIController); 43 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MIDIController);
44 public: 44 public:
45 virtual ~MIDIController(); 45 virtual ~MIDIController();
46 46
47 void requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess>); 47 void requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess>);
48 void cancelSysexPermissionRequest(MIDIAccess*); 48 void cancelSysexPermissionRequest(MIDIAccess*);
49 49
50 static PassOwnPtrWillBeRawPtr<MIDIController> create(PassOwnPtr<MIDIClient>) ; 50 static PassOwnPtrWillBeRawPtr<MIDIController> create(PassOwnPtr<MIDIClient>) ;
51 static const char* supplementName(); 51 static const char* supplementName();
52 static MIDIController* from(Page* page) { return static_cast<MIDIController* >(WillBeHeapSupplement<Page>::from(page, supplementName())); } 52 static MIDIController* from(LocalFrame* frame) { return static_cast<MIDICont roller*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName())); }
sof 2014/06/06 19:32:55 s/WillBeHeapSupplement/Supplement/
53 53
54 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); } 54 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<LocalFr ame>::trace(visitor); }
sof 2014/06/06 19:32:55 You can remove this trace() OVERRIDE.
55 55
56 protected: 56 protected:
57 explicit MIDIController(PassOwnPtr<MIDIClient>); 57 explicit MIDIController(PassOwnPtr<MIDIClient>);
58 58
59 private: 59 private:
60 OwnPtr<MIDIClient> m_client; 60 OwnPtr<MIDIClient> m_client;
61 }; 61 };
62 62
63 } // namespace WebCore 63 } // namespace WebCore
64 64
65 #endif // MIDIController_h 65 #endif // MIDIController_h
OLDNEW
« no previous file with comments | « Source/modules/webmidi/MIDIClient.h ('k') | Source/modules/webmidi/MIDIController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698