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

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

Issue 24070002: Web MIDI: MIDIInput/MIDIOutput should not have reference to MIDIAccess (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: (rebase) Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/webmidi/MIDIAccess.cpp ('k') | Source/modules/webmidi/MIDIInput.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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #ifndef MIDIInput_h 31 #ifndef MIDIInput_h
32 #define MIDIInput_h 32 #define MIDIInput_h
33 33
34 #include "core/dom/EventTarget.h" 34 #include "core/dom/EventTarget.h"
35 #include "modules/webmidi/MIDIPort.h" 35 #include "modules/webmidi/MIDIPort.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 class MIDIAccess;
39 class ScriptExecutionContext; 40 class ScriptExecutionContext;
40 41
41 class MIDIInput : public MIDIPort { 42 class MIDIInput : public MIDIPort {
42 public: 43 public:
43 static PassRefPtr<MIDIInput> create(ScriptExecutionContext*, const String& i d, const String& manufacturer, const String& name, const String& version); 44 static PassRefPtr<MIDIInput> create(MIDIAccess*, ScriptExecutionContext*, co nst String& id, const String& manufacturer, const String& name, const String& ve rsion);
44 virtual ~MIDIInput() { } 45 virtual ~MIDIInput() { }
45 46
46 DEFINE_ATTRIBUTE_EVENT_LISTENER(midimessage); 47 DEFINE_ATTRIBUTE_EVENT_LISTENER(midimessage);
47 48
48 // EventTarget 49 // EventTarget
49 virtual const AtomicString& interfaceName() const OVERRIDE { return eventNam es().interfaceForMIDIInput; } 50 virtual const AtomicString& interfaceName() const OVERRIDE { return eventNam es().interfaceForMIDIInput; }
50 51
51 // |timeStamp| is a DOMHighResTimeStamp in the time coordinate system of per formance.now(). 52 // |timeStamp| is a DOMHighResTimeStamp in the time coordinate system of per formance.now().
52 void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_ t length, double timeStamp); 53 void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_ t length, double timeStamp);
53 54
55 MIDIAccess* midiAccess() const { return m_access; }
56
54 private: 57 private:
55 MIDIInput(ScriptExecutionContext*, const String& id, const String& manufactu rer, const String& name, const String& version); 58 MIDIInput(MIDIAccess*, ScriptExecutionContext*, const String& id, const Stri ng& manufacturer, const String& name, const String& version);
59
60 MIDIAccess* m_access;
56 }; 61 };
57 62
58 typedef Vector<RefPtr<MIDIInput> > MIDIInputVector; 63 typedef Vector<RefPtr<MIDIInput> > MIDIInputVector;
59 64
60 } // namespace WebCore 65 } // namespace WebCore
61 66
62 #endif // MIDIInput_h 67 #endif // MIDIInput_h
OLDNEW
« no previous file with comments | « Source/modules/webmidi/MIDIAccess.cpp ('k') | Source/modules/webmidi/MIDIInput.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698